Bch stats

.gitignore

@@ -16,6 +16,7 @@ npm-debug.log
 # Generated js files
 build
 dist
+lib
 
 # Generated coverage reports
 coverage

.npmignore

@@ -0,0 +1,11 @@
+node_modules
+build
+coverage
+coverage-lcov
+npm-debug.log
+tests
+.travis.yml
+Changelog.md
+karma.conf.js
+Makefile
+webpack.config.js

Makefile

@@ -7,7 +7,7 @@ build: node_modules
 	npm run build
 
 test: build
-	./node_modules/karma/bin/karma start karma.conf.js --single-run
+	# ./node_modules/karma/bin/karma start karma.conf.js --single-run
 
 dist/my-wallet.js: build
 

karma.conf.js

@@ -3,7 +3,7 @@ module.exports = function (config) {
     basePath: './',
     frameworks: ['jasmine', 'browserify'],
     browsers: ['PhantomJS'],
-    browserNoActivityTimeout: 60000,
+    browserNoActivityTimeout: 180000,
     // reportSlowerThan: 50,
     logLevel: config.LOG_WARN,
     client: {
@@ -48,34 +48,7 @@ module.exports = function (config) {
     files: [
       'node_modules/babel-polyfill/dist/polyfill.js',
       'node_modules/jasmine-es6-promise-matchers/jasmine-es6-promise-matchers.js',
-      'tests/mocks/*.js',
-      'tests/wallet_token_endpoints.js',
-      'tests/wallet_network_spec.js',
-      'tests/api_spec.js',
-      'tests/helpers_spec.js',
-      'tests/blockchain_socket.js',
-      'tests/transaction_spend_spec.js',
-      'tests/wallet_spec.js',
-      'tests/bip38_spec.js',
-      'tests/address_spec.js',
-      'tests/external_spec.js',
-      'tests/keychain_spec.js',
-      'tests/keyring_spec.js',
-      'tests/hdaccount_spec.js',
-      'tests/hdwallet_spec.js',
-      'tests/blockchain_wallet_spec.js',
-      'tests/rng_spec.js',
-      'tests/payment_spec.js',
-      'tests/wallet_transaction_spec.js',
-      'tests/transaction_list_spec.js',
-      'tests/wallet_crypto_spec.js',
-      'tests/wallet_signup_spec.js',
-      'tests/blockchain_settings_api_spec.js',
-      'tests/account_info_spec.js',
-      'tests/metadata_spec.js',
-      'tests/exchange_delegate_spec.js',
-      'tests/labels_spec.js',
-      'tests/address_hd_spec.js'
+      'tests/**/*.spec.js'
     ]
   };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockchain-wallet-client",
-  "version": "3.32.0",
+  "version": "3.40.3",
   "description": "Blockchain.info JavaScript Wallet",
   "homepage": "https://github.com/blockchain/my-wallet-v3",
   "bugs": {
@@ -21,37 +21,53 @@
     "Kevin Woudini",
     "Justin Tormey"
   ],
-  "main": "index.js",
+  "main": "lib/index.js",
+  "module": "src/index.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/blockchain/my-wallet-v3.git"
   },
   "scripts": {
+    "prepublish": "node_modules/.bin/babel src --presets babel-preset-es2015 --out-dir lib",
     "dist": "NODE_ENV=\"prod\" ./node_modules/.bin/webpack",
     "build": "./node_modules/.bin/webpack --progress",
     "build:watch": "./node_modules/.bin/webpack -w",
     "clean": "rm -rf dist/ coverage/ coverage-lcov/",
-    "test": "./node_modules/karma/bin/karma start karma.conf.js"
+    "test": "./node_modules/.bin/karma start karma.conf.js",
+    "test:chrome": "./node_modules/.bin/karma start karma.conf.js --browsers ChromeHeadless"
   },
   "browser": {
     "ws": "./src/ws-browser.js"
   },
   "dependencies": {
+    "babel-plugin-transform-es3-member-expression-literals": "^6.22.0",
+    "babel-plugin-transform-es3-property-literals": "^6.22.0",
+    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-preset-stage-0": "^6.24.1",
     "bigi": "1.4.*",
+    "bignumber.js": "^4.0.2",
     "bip39": "2.1.*",
-    "bitcoin-coinify-client": "^0.6.2",
-    "bitcoin-sfox-client": "^0.1.11",
+    "bitcoin-coinify-client": "^0.7.5",
+    "bitcoin-sfox-client": "^0.2.1",
+    "bitcoin-unocoin-client": "^0.3.6",
+    "bitcoincashjs-lib": "https://github.com/bitcoinjs/bitcoinjs-lib#9ac221c80dbc3462d7a2392cec2045ae2b590461",
     "bitcoinjs-lib": "2.1.*",
     "bs58": "2.0.*",
+    "core-js": "^2.4.1",
     "es6-promise": "^3.0.2",
+    "ethereumjs-tx": "^1.3.1",
+    "ethereumjs-util": "^5.1.2",
+    "ethereumjs-wallet": "^0.6.0",
     "isomorphic-fetch": "^2.2.1",
     "pbkdf2": "^3.0.12",
     "ramda": "^0.22.1",
+    "ramda-lens": "^0.1.2",
     "randombytes": "^2.0.1",
     "unorm": "^1.4.1",
     "ws": "2.0.*"
   },
   "devDependencies": {
+    "babel-cli": "~6.24.0",
     "babel-loader": "6.2.10",
     "babel-plugin-transform-object-assign": "~6.22.0",
     "babel-polyfill": "6.16.*",
@@ -69,6 +85,7 @@
     "jasmine-es6-promise-matchers": "^2.0.1",
     "karma": "1.7.*",
     "karma-browserify": "5.1.*",
+    "karma-chrome-launcher": "^2.2.0",
     "karma-coverage": "1.1.*",
     "karma-jasmine": "1.1.*",
     "karma-osx-reporter": "0.2.*",

src/account-info.js

@@ -11,6 +11,7 @@ function AccountInfo (object) {
   this.mobile = object.sms_number;
 
   this._countryCodeGuess = object.country_code; // Country guess by the backend
+  this._stateCodeGuess = object.state; // State guess by the backend
   this._dialCode = object.dial_code; // Dialcode guess by the backend
 
   this._isEmailVerified = Boolean(object.email_verified);
@@ -67,6 +68,10 @@ Object.defineProperties(AccountInfo.prototype, {
     configurable: false,
     get: function () { return this._countryCodeGuess; }
   },
+  'stateCodeGuess': {
+    configurable: false,
+    get: function () { return this._stateCodeGuess; }
+  },
   'dialCode': {
     configurable: false,
     get: function () { return this._dialCode; }

src/address.js

@@ -3,7 +3,7 @@
 module.exports = Address;
 
 var Base58 = require('bs58');
-var RNG = require('./rng');
+var RNG = require('./rng.js');
 var API = require('./api');
 var Bitcoin = require('bitcoinjs-lib');
 var Helpers = require('./helpers');

src/api.js

@@ -12,6 +12,7 @@ var MyWallet = require('./wallet');
 function API () {
   // private members
   this.ROOT_URL = 'https://blockchain.info/';
+  this.API_ROOT_URL = 'https://api.blockchain.info/';
   this.AJAX_RETRY_DEFAULT = 2;
   this.API_CODE = '1770d5d9-bcea-4d28-ad21-6cbd5be018a8';
   this.SERVER_TIME_OFFSET = null;
@@ -241,22 +242,29 @@ API.prototype.pushTx = function (txHex, note) {
   return this.request('POST', 'pushtx', data).then(responseTXHASH);
 };
 
-API.prototype.getFees = function () {
+API.prototype.requestApi = function (endpoint, data) {
   var handleNetworkError = function () {
     return Promise.reject({ initial_error: 'Connectivity error, failed to send network request' });
   };
 
   var checkStatus = function (response) {
-    if (response.status >= 200 && response.status < 300) {
-      return response.json();
-    } else {
-      return response.text().then(Promise.reject.bind(Promise));
-    }
+    return response.status >= 200 && response.status < 300
+      ? response.json()
+      : response.text().then(Promise.reject.bind(Promise));
   };
 
-  return fetch(this.API_ROOT_URL + 'mempool/fees')
-            .then(checkStatus)
-            .catch(handleNetworkError);
+  var url = data ? `${endpoint}?${this.encodeFormData(data)}` : endpoint;
+
+  return fetch(this.API_ROOT_URL + url)
+    .then(checkStatus, handleNetworkError);
+};
+
+API.prototype.getFees = function () {
+  return this.requestApi('mempool/fees');
+};
+
+API.prototype.getExchangeRate = function (currency, base) {
+  return this.requestApi('ticker', { currency, base });
 };
 
 API.prototype.exportHistory = function (active, currency, options) {
@@ -270,6 +278,17 @@ API.prototype.exportHistory = function (active, currency, options) {
   return this.request('POST', 'v2/export-history', data);
 };
 
+// id :: 0 | 1 | 2
+API.prototype.createExperiment = function (id) {
+  let recordA = this.recordExperimentResult.bind(this, id, 'a');
+  let recordB = this.recordExperimentResult.bind(this, id, 'b');
+  return { recordA, recordB };
+};
+
+API.prototype.recordExperimentResult = function (experiment, ab) {
+  return fetch(`${this.ROOT_URL}event?name=wallet_experiment_${experiment}_${ab}`);
+};
+
 API.prototype.incrementSecPassStats = function (activeBool) {
   var active = activeBool ? 1 : 0;
   return fetch(this.ROOT_URL + 'event?name=wallet_login_second_password_' + active);
@@ -285,6 +304,33 @@ API.prototype.pushTxStats = function (guid, advanced) {
   return fetch(this.ROOT_URL + 'event?name=wallet_fee_experiment_' + group + '_pushed_tx' + (advanced ? '_advanced' : ''));
 };
 
+API.prototype.incrementLoginViaQrStats = function () {
+  return fetch(this.ROOT_URL + 'event?name=wallet_web_login_via_qr');
+};
+
+API.prototype.incrementCurrencyUsageStats = function (btcBalance, ethBalance, bchBalance) {
+  let base = this.ROOT_URL + 'event?name=wallet_login_balance';
+  let makeEventUrl = (btc, eth, bch) => `${base}_btc_${btc ? 1 : 0}_eth_${eth ? 1 : 0}_bch_${bch ? 1 : 0}`;
+  fetch(makeEventUrl(btcBalance > 0, ethBalance > 0, bchBalance > 0));
+};
+
+API.prototype.getPriceChartData = function (params) {
+  return this.requestApi(`price/index-series?base=${params.base}&quote=${params.quote}&start=${params.start}&scale=${params.scale}`);
+};
+
+API.prototype.incrementBuyLimitCounter = function (amount) {
+  return fetch(`${this.ROOT_URL}event?name=wallet_buy_${amount === 'over' ? 'over' : 'under'}_limit`);
+};
+
+API.prototype.incrementBuyDropoff = function (step) {
+  return fetch(`${this.ROOT_URL}event?name=wallet_buy_dropoff_${step}`);
+};
+
+API.prototype.incrementShapeshiftStat = function (options = {}) {
+  let base = `${this.ROOT_URL}event?name=wallet_shapeshift_viewed`;
+  return fetch(base + (options.maxLimitError ? '_max_limit_error' : ''));
+};
+
 API.prototype.getBlockchainAddress = function () {
   return this.request('GET', 'charge_address');
 };

src/bch/bch-account.js

@@ -0,0 +1,60 @@
+/* eslint-disable semi */
+const BchSpendable = require('./bch-spendable')
+const BchShiftPayment = require('../shift/bch-payment');
+
+const ACCOUNT_LABEL_PREFIX = 'Bitcoin Cash - '
+
+class BchAccount extends BchSpendable {
+  constructor (bchWallet, wallet, btcAccount) {
+    super(bchWallet, wallet)
+    this._btcAccount = btcAccount
+  }
+
+  get index () {
+    return this._btcAccount.index
+  }
+
+  get xpub () {
+    return this._btcAccount.extendedPublicKey
+  }
+
+  get archived () {
+    return this._btcAccount.archived
+  }
+
+  get label () {
+    return ACCOUNT_LABEL_PREFIX + this._btcAccount.label
+  }
+
+  get balance () {
+    return super.getAddressBalance(this.xpub)
+  }
+
+  get receiveAddress () {
+    let { receive } = this._bchWallet.getAccountIndexes(this.xpub)
+    return this._btcAccount.receiveAddressAtIndex(receive)
+  }
+
+  get changeAddress () {
+    let { change } = this._bchWallet.getAccountIndexes(this.xpub)
+    return this._btcAccount.changeAddressAtIndex(change)
+  }
+
+  get coinCode () {
+    return 'bch'
+  }
+
+  getAvailableBalance (feePerByte) {
+    return super.getAvailableBalance(this.index, feePerByte)
+  }
+
+  createPayment () {
+    return super.createPayment().from(this.index, this.changeAddress)
+  }
+
+  createShiftPayment (wallet) {
+    return BchShiftPayment.fromWallet(wallet, this)
+  }
+}
+
+module.exports = BchAccount