workaround to keep the tsc version on copay

Author: rastajpa

packages/bitcore-wallet-client/package.json

@@ -66,7 +66,7 @@
     "docs": "./node_modules/.bin/jsdox lib/* lib/common lib/errors -o docs && cat README.header.md  docs/*.md LICENSE > README.md",
     "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage",
     "compile": "npm run tsc",
-    "tsc": "npm run clean && ./node_modules/.bin/tsc",
+    "tsc": "npm run clean && tsc",
     "build": "tsc && npm run lint",
     "clean": "rimraf ./ts_build",
     "lint": "tslint -c tslint.json 'src/**/*.ts'",

packages/bitcore-wallet-client/src/lib/api.ts

@@ -3,7 +3,7 @@
 import { EventEmitter } from 'events';
 import _ from 'lodash';
 import sjcl from 'sjcl';
-import { Common } from './common';
+import { Constants, Utils } from './common';
 import { Credentials } from './credentials';
 import { Key } from './key';
 import { PayPro } from './paypro';
@@ -23,10 +23,6 @@ var Mnemonic = require('bitcore-mnemonic');
 var url = require('url');
 var querystring = require('querystring');
 
-var Constants = Common.Constants;
-var Defaults = Common.Defaults;
-var Utils = Common.Utils;
-
 var log = require('./log');
 const Errors = require('./errors');
 
@@ -99,7 +95,7 @@ export class API extends EventEmitter {
   }
 
   _fetchLatestNotifications(interval, cb) {
-    cb = cb || function() {};
+    cb = cb || function () { };
 
     var opts: any = {
       lastNotificationId: this.lastNotificationId,
@@ -290,7 +286,7 @@ export class API extends EventEmitter {
       var words;
       try {
         words = c.getMnemonic();
-      } catch (ex) {}
+      } catch (ex) { }
 
       var xpriv;
       if (words && (!c.mnemonicHasPassphrase || opts.passphrase)) {
@@ -627,7 +623,7 @@ export class API extends EventEmitter {
         };
         t.inputs[i].addSignature(t, s);
         i++;
-      } catch (e) {}
+      } catch (e) { }
     });
     if (i != txp.inputs.length) throw new Error('Wrong signatures');
   }
@@ -737,9 +733,9 @@ export class API extends EventEmitter {
 
     this.request.get(
       '/v2/feelevels/?coin=' +
-        (coin || 'btc') +
-        '&network=' +
-        (network || 'livenet'),
+      (coin || 'btc') +
+      '&network=' +
+      (network || 'livenet'),
       (err, result) => {
         if (err) return cb(err);
         return cb(err, result);
@@ -1458,9 +1454,9 @@ export class API extends EventEmitter {
               encryptedPkr: opts.doNotEncryptPkr
                 ? null
                 : Utils.encryptMessage(
-                    JSON.stringify(this.credentials.publicKeyRing),
-                    this.credentials.personalEncryptingKey
-                  ),
+                  JSON.stringify(this.credentials.publicKeyRing),
+                  this.credentials.personalEncryptingKey
+                ),
               unencryptedPkr: opts.doNotEncryptPkr
                 ? JSON.stringify(this.credentials.publicKeyRing)
                 : null,
@@ -2118,11 +2114,11 @@ export class API extends EventEmitter {
     var ret;
     try {
       ret = JSON.parse(decrypted);
-    } catch (e) {}
+    } catch (e) { }
     return ret;
   }
 
-  getWalletIdsFromOldCopay(username, password, blob) {
+  getWalletIdsFromOldCopay(username, password, blob): any[] {
     var p = this._oldCopayDecrypt(username, password, blob);
     if (!p) return null;
     var ids = p.walletIds.concat(_.keys(p.focusedTimestamps));

packages/bitcore-wallet-client/src/lib/common/index.ts

@@ -1,4 +1,3 @@
-import { Constants } from './constants';
-import { Defaults } from './defaults';
-import { Utils } from './utils';
-export const Common = { Constants, Defaults, Utils };
+export { Constants } from './constants';
+export { Defaults } from './defaults';
+export { Utils } from './utils';

packages/bitcore-wallet-client/src/lib/credentials.ts

@@ -1,15 +1,13 @@
 'use strict';
 
-import { Common } from './common';
+import { Constants, Utils } from './common';
 const $ = require('preconditions').singleton();
 const _ = require('lodash');
 
 const Bitcore = require('bitcore-lib');
 const Mnemonic = require('bitcore-mnemonic');
 const sjcl = require('sjcl');
 
-const Constants = Common.Constants;
-const Utils = Common.Utils;
 export class Credentials {
   static FIELDS = [
     'coin',
@@ -183,7 +181,7 @@ export class Credentials {
       throw new Error('Bad credentials version');
     }
 
-    _.each(Credentials.FIELDS, function(k) {
+    _.each(Credentials.FIELDS, function (k) {
       x[k] = obj[k];
     });
 
@@ -206,7 +204,7 @@ export class Credentials {
     var self = this;
 
     var x = {};
-    _.each(Credentials.FIELDS, function(k) {
+    _.each(Credentials.FIELDS, function (k) {
       x[k] = self[k];
     });
     return x;

packages/bitcore-wallet-client/src/lib/key.ts

@@ -2,7 +2,7 @@
 
 var $ = require('preconditions').singleton();
 import * as _ from 'lodash';
-import { Common } from './common';
+import { Constants, Utils } from './common';
 import { Credentials } from './credentials';
 
 var Bitcore = require('bitcore-lib');
@@ -13,8 +13,6 @@ const async = require('async');
 const Uuid = require('uuid');
 
 var Errors = require('./errors');
-var Constants = Common.Constants;
-var Utils = Common.Utils;
 
 const wordsForLang: any = {
   en: Mnemonic.Words.ENGLISH,
@@ -63,7 +61,7 @@ export class Key {
     return a.id == b.id;
   }
 
-  static create = function(opts) {
+  static create = function (opts) {
     opts = opts || {};
     if (opts.language && !wordsForLang[opts.language])
       throw new Error('Unsupported language');
@@ -90,7 +88,7 @@ export class Key {
     return x;
   };
 
-  static fromMnemonic = function(words, opts) {
+  static fromMnemonic = function (words, opts) {
     $.checkArgument(words);
     if (opts) $.shouldBeObject(opts);
     opts = opts || {};
@@ -111,7 +109,7 @@ export class Key {
     return x;
   };
 
-  static fromExtendedPrivateKey = function(xPriv, opts) {
+  static fromExtendedPrivateKey = function (xPriv, opts) {
     $.checkArgument(xPriv);
     opts = opts || {};
 
@@ -136,37 +134,37 @@ export class Key {
     return x;
   };
 
-  static fromObj = function(obj) {
+  static fromObj = function (obj) {
     $.shouldBeObject(obj);
 
     var x: any = new Key();
     if (obj.version != x.version) {
       throw new Error('Bad Key version');
     }
 
-    _.each(Key.FIELDS, function(k) {
+    _.each(Key.FIELDS, function (k) {
       x[k] = obj[k];
     });
 
     $.checkState(x.xPrivKey || x.xPrivKeyEncrypted, 'invalid input');
     return x;
   };
 
-  toObj = function() {
+  toObj = function () {
     var self = this;
 
     var x = {};
-    _.each(Key.FIELDS, function(k) {
+    _.each(Key.FIELDS, function (k) {
       x[k] = self[k];
     });
     return x;
   };
 
-  isPrivKeyEncrypted = function() {
+  isPrivKeyEncrypted = function () {
     return !!this.xPrivKeyEncrypted && !this.xPrivKey;
   };
 
-  checkPassword = function(password) {
+  checkPassword = function (password) {
     if (this.isPrivKeyEncrypted()) {
       try {
         sjcl.decrypt(password, this.xPrivKeyEncrypted);
@@ -178,7 +176,7 @@ export class Key {
     return null;
   };
 
-  get = function(password) {
+  get = function (password) {
     var keys: any = {};
     let fingerPrintUpdated = false;
 
@@ -213,7 +211,7 @@ export class Key {
     return keys;
   };
 
-  encrypt = function(password, opts) {
+  encrypt = function (password, opts) {
     if (this.xPrivKeyEncrypted)
       throw new Error('Private key already encrypted');
 
@@ -229,7 +227,7 @@ export class Key {
     delete this.mnemonic;
   };
 
-  decrypt = function(password) {
+  decrypt = function (password) {
     if (!this.xPrivKeyEncrypted)
       throw new Error('Private key is not encrypted');
 
@@ -246,7 +244,7 @@ export class Key {
     }
   };
 
-  derive = function(password, path) {
+  derive = function (password, path) {
     $.checkArgument(path, 'no path at derive()');
     var xPrivKey = new Bitcore.HDPrivateKey(
       this.get(password).xPrivKey,
@@ -306,7 +304,7 @@ export class Key {
    * opts.n
    */
 
-  createCredentials = function(password, opts) {
+  createCredentials = function (password, opts) {
     opts = opts || {};
 
     if (password) $.shouldBeString(password, 'provide password');
@@ -357,7 +355,7 @@ export class Key {
    * opts.requestPrivKey
    */
 
-  createAccess = function(password, opts) {
+  createAccess = function (password, opts) {
     opts = opts || {};
     $.shouldBeString(opts.path);
 
@@ -374,7 +372,7 @@ export class Key {
     };
   };
 
-  sign = function(rootPath, txp, password, cb) {
+  sign = function (rootPath, txp, password, cb) {
     $.shouldBeString(rootPath);
     if (this.isPrivKeyEncrypted() && !password) {
       return cb(new Errors.ENCRYPTED_PRIVATE_KEY());
@@ -385,7 +383,7 @@ export class Key {
     var derived = this.derive(password, rootPath);
     var xpriv = new Bitcore.HDPrivateKey(derived);
 
-    _.each(txp.inputs, function(i) {
+    _.each(txp.inputs, function (i) {
       $.checkState(
         i.path,
         'Input derivation path not available (signing transaction)'
@@ -397,11 +395,11 @@ export class Key {
     });
 
     var t = Utils.buildTx(txp);
-    var signatures = _.map(privs, function(priv, i) {
+    var signatures = _.map(privs, function (priv, i) {
       return t.getSignatures(priv);
     });
 
-    signatures = _.map(_.sortBy(_.flatten(signatures), 'inputIndex'), function(
+    signatures = _.map(_.sortBy(_.flatten(signatures), 'inputIndex'), function (
       s
     ) {
       return s.signature.toDER().toString('hex');

packages/bitcore-wallet-client/src/lib/request.ts

@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { Common } from './common';
+import { Utils } from './common';
 
 const request = require('superagent');
 const async = require('async');
@@ -8,7 +8,6 @@ var log = require('./log');
 
 const util = require('util');
 var Errors = require('./errors');
-const Utils = Common.Utils;
 
 export class Request {
   baseUrl: any;
@@ -155,10 +154,10 @@ export class Request {
       } else {
         ret = new Error(
           body.code +
-            ': ' +
-            (_.isObject(body.message)
-              ? JSON.stringify(body.message)
-              : body.message)
+          ': ' +
+          (_.isObject(body.message)
+            ? JSON.stringify(body.message)
+            : body.message)
         );
       }
     } else {

packages/bitcore-wallet-client/src/lib/verifier.ts

@@ -1,10 +1,9 @@
 import * as _ from 'lodash';
-import { Common } from "./common";
+import { Utils } from './common';
 var $ = require('preconditions').singleton();
 
 var Bitcore = require('bitcore-lib');
 var BCHAddress = require('bitcore-lib-cash').Address;
-const Utils = Common.Utils;
 
 var log = require('./log');
 

packages/bitcore-wallet-client/test/api.test.js

@@ -23,12 +23,12 @@ var Bitcore_ = {
 
 var BWS = require('bitcore-wallet-service');
 
-var { Common } = require('../ts_build/common');
-var Constants = Common.Constants;
+var { Constants } = require('../ts_build/common');
 var Client = require('../ts_build').default;
 var Key = Client.Key;
 var { Request } = require('../ts_build/request.js');
-var Utils = Common.Utils;
+var { Utils } = require('../ts_build/common');
+
 var ExpressApp = BWS.ExpressApp;
 var Storage = BWS.Storage;
 var TestData = require('./testdata');

packages/bitcore-wallet-client/test/utils.test.js

@@ -4,9 +4,7 @@ var _ = require('lodash');
 var chai = require('chai');
 var should = chai.should();
 var Bitcore = require('bitcore-lib');
-var { Common } = require('../ts_build/common');
-var Utils = Common.Utils;
-
+var { Utils } = require('../ts_build/common');
 
 describe('Utils', () => {