CT-364: Convert Wallet and Wallets to ES6 class and improve type support

modules/core/package.json

@@ -40,11 +40,6 @@
   "dependencies": {
     "@bitgo/statics": "^1.2.0",
     "@bitgo/unspents": "^0.6.0",
-    "@types/bluebird": "^3.5.25",
-    "@types/lodash": "=4.14.121",
-    "@types/mocha": "^5.2.6",
-    "@types/nock": "^9.3.1",
-    "@types/node": "^11.11.4",
     "algosdk": "git+https://github.com/BitGo/algosdk-bitgo.git",
     "assert": "^0.4.9",
     "big.js": "^3.1.3",
@@ -71,7 +66,13 @@
     "superagent-proxy": "^1.0.3"
   },
   "devDependencies": {
-    "@types/create-hmac": "1.1.0",
+    "@types/bluebird": "^3.5.25",
+    "@types/create-hmac": "^1.1.0",
+    "@types/debug": "^4.1.4",
+    "@types/lodash": "=4.14.121",
+    "@types/mocha": "^5.2.6",
+    "@types/nock": "^9.3.1",
+    "@types/node": "^11.11.4",
     "@types/sinon": "^7.0.6",
     "@typescript-eslint/eslint-plugin": "^1.4.2",
     "@typescript-eslint/parser": "^1.4.2",

modules/core/src/v2/baseCoin.ts

@@ -4,10 +4,11 @@ import { hdPath } from '../bitcoin';
 const bitcoinMessage = require('bitcoinjs-message');
 import * as Bluebird from 'bluebird';
 import * as errors from '../errors';
+import { NodeCallback } from './types';
 const co = Bluebird.coroutine;
 
-const Wallet = require('./wallet');
-const Wallets = require('./wallets');
+import { Wallet } from './wallet';
+import { Wallets } from './wallets';
 const Keychains = require('./keychains');
 const Webhooks = require('./webhooks');
 const PendingApprovals = require('./pendingApprovals');
@@ -157,7 +158,7 @@ export abstract class BaseCoin {
   /**
    * Verify that a transaction prebuild complies with the original intention
    */
-  verifyTransaction(params, callback) {
+  verifyTransaction(params, callback?: NodeCallback<any>) {
     return Bluebird.resolve(true).asCallback(callback);
   }
 
@@ -189,7 +190,7 @@ export abstract class BaseCoin {
   /**
    * Get extra parameters for prebuilding a tx. Add things like hop transaction params
    */
-  getExtraPrebuildParams(buildParams, callback): Bluebird<any> {
+  getExtraPrebuildParams(buildParams, callback?: NodeCallback<any>): Bluebird<any> {
     return Bluebird.method(function() {
       return {};
     }).call(this).asCallback(callback);
@@ -198,7 +199,7 @@ export abstract class BaseCoin {
   /**
    * Modify prebuild after receiving it from the server. Add things like nlocktime
    */
-  postProcessPrebuild(prebuildResponse, callback): Bluebird<any> {
+  postProcessPrebuild(prebuildResponse, callback?: NodeCallback<any>): Bluebird<any> {
     return Bluebird.method(function() {
       return prebuildResponse;
     }).call(this).asCallback(callback);
@@ -207,7 +208,7 @@ export abstract class BaseCoin {
   /**
    * Coin-specific things done before signing a transaction, i.e. verification
    */
-  presignTransaction(params, callback): Bluebird<any> {
+  presignTransaction(params, callback?: NodeCallback<any>): Bluebird<any> {
     return Bluebird.method(function() {
       return params;
     }).call(this).asCallback(callback);
@@ -228,7 +229,7 @@ export abstract class BaseCoin {
    * @param callback
    * @returns {Object} The info returned from the merchant server
    */
-  feeEstimate(params, callback): Bluebird<any> {
+  feeEstimate(params, callback?: NodeCallback<any>): Bluebird<any> {
     return co(function *coFeeEstimate() {
       const query: any = {};
       if (params && params.numBlocks) {
@@ -355,7 +356,7 @@ export abstract class BaseCoin {
     return Bluebird.reject(new errors.MethodNotImplementedError());
   }
 
-  parseTransaction(params, callback): Bluebird<any> {
+  parseTransaction(params, callback?: NodeCallback<any>): Bluebird<any> {
     return Bluebird.resolve({});
   }
 

modules/core/src/v2/coins/eth.ts

@@ -1,5 +1,5 @@
 import { BaseCoin } from '../baseCoin';
-const Wallet = require('../wallet');
+import { Wallet } from '../wallet';
 import * as common from '../../common';
 import * as config from '../../config';
 const BigNumber = require('bignumber.js');