Merge branch 'development' into 62_send-all

Author: Oliver Beddows

LICENSE

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/LiskHQ/lisk-nano.svg?branch=development)](https://travis-ci.org/LiskHQ/lisk-nano)
 [![Coverage Status](https://coveralls.io/repos/github/LiskHQ/lisk-nano/badge.svg?branch=development)](https://coveralls.io/github/LiskHQ/lisk-nano?branch=development)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](http://www.gnu.org/licenses/gpl-3.0)
 
 ## Development
 
@@ -109,15 +110,30 @@ npm run e2e-test
 
 ## Authors
 
-Ricardo Ferro <ricardo@lisk.io>
+- Ricardo Ferro <ricardo.ferro@gmail.com>
+- Oliver Beddows <oliver@lightcurve.io>
+- Vít Stanislav <vit@lightcurve.io>
+- Tobias Schwarz <tobias@lightcurve.io>
+- Ali Haghighatkhah <ali@lightcurve.io>
 
 ## License
 
-The MIT License (MIT)
+Copyright © 2016-2017 Lisk Foundation
 
-Copyright (c) 2016-2017 Lisk
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:  
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the [GNU General Public License](https://github.com/LiskHQ/lisk-nano/tree/master/LICENSE) along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***
+
+This program also incorporates work previously released with lisk-nano `0.1.2` (and earlier) versions under the [MIT License](https://opensource.org/licenses/MIT). To comply with the requirements of that license, the following permission notice, applicable to those parts of the code only, is included below:
+
+Copyright © 2016-2017 Lisk Foundation  
+Copyright © 2015 Crypti
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 

README.md

@@ -11,6 +11,8 @@
     "dist:osx": "build --osx",
     "dist:linux": "build --linux"
   },
+  "author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
+  "license": "GPL-3.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LiskHQ/lisk-nano"

package.json

@@ -192,7 +192,7 @@ app.component('login', {
     }
 
     // istanbul ignore next
-    // lets consider this to be third party code that we don't want to test
+    // Let's consider this to be third party code that we don't want to test
     static mobileAndTabletcheck() {
       let check = false
       ;(function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd(m|p|t)|hei|hi(pt|ta)|hp( i|ip)|hsc|ht(c(| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i(20|go|ma)|i230|iac( ||\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|[a-w])|libw|lynx|m1w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|mcr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|([1-8]|c))|phil|pire|pl(ay|uc)|pn2|po(ck|rt|se)|prox|psio|ptg|qaa|qc(07|12|21|32|60|[2-7]|i)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h|oo|p)|sdk\/|se(c(|0|1)|47|mc|nd|ri)|sgh|shar|sie(|m)|sk0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h|v|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl|tdg|tel(i|m)|tim|tmo|to(pl|sh)|ts(70|m|m3|m5)|tx9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas|your|zeto|zte/i.test(a.substr(0, 4))) check = true; }(navigator.userAgent || navigator.vendor || window.opera));

src/app/components/login/login.js

@@ -6,8 +6,12 @@ app.component('top', {
     account: '<',
   },
   controller: class top {
-    constructor($peers) {
+    constructor($peers, $scope) {
       this.$peers = $peers;
+
+      $scope.$watch('$ctrl.$peers.currentPeerConfig', () => {
+        this.$peers.setActive(this.$peers.currentPeerConfig);
+      });
     }
   },
 });

src/app/components/top/top.js

@@ -9,9 +9,9 @@ md-content(layout='column', layout-gt-xs='row')
         i.material-icons.offline(ng-show='!$ctrl.$peers.online') error
         i.material-icons.online(ng-show='$ctrl.$peers.online') check circle
       span.md-title.title Peer
-      md-select(ng-model='$ctrl.$peers.active.currentPeer', aria-label='Peer')
+      md-select(ng-model='$ctrl.$peers.currentPeerConfig', aria-label='Peer')
         md-optgroup(ng-repeat='(name, peers) in $ctrl.$peers.stack', ng-if='peers.length', label='{{ name }}')
-          md-option(ng-repeat='peer in peers', ng-value='peer') {{ peer }}
+          md-option(ng-repeat='peer in peers', ng-value='peer') {{ peer.node }}{{ peer.port ? ':' + peer.port : '' }}
   md-card.offline-hide(flex-gt-xs=33)
     md-card-content(layout='column', layout-align='center center')
       span.md-title.title Balance

src/app/components/top/top.pug

@@ -16,19 +16,36 @@ app.factory('$peers', ($timeout, $cookies, $location, $q) => {
       }
     }
 
-    setActive() {
+    setActive(peerConf) {
       const peerStack = $location.search().peerStack || $cookies.get('peerStack') || 'official';
-      const conf = { };
-      if (peerStack === 'localhost') {
-        conf.node = 'localhost';
-        conf.port = 4000;
-        conf.testnet = true;
-        conf.nethash = '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d';
-      } else if (peerStack === 'testnet') {
+      let conf = peerConf || { };
+      const localhostConf = {
+        node: 'localhost',
+        port: 4000,
+        testnet: true,
+        nethash: '198f2b61a8eb95fbeed58b8216780b68f697f26b849acf00c8c93bb9b24f783d',
+      };
+      if (peerStack === 'localhost' && !peerConf) {
+        conf = localhostConf;
+      } else if (peerStack === 'testnet' && !peerConf) {
         conf.testnet = true;
       }
-      this.active = lisk.api(conf);
-      this.stack = this.active.listPeers();
+
+      this.setPeerAPIObject(conf);
+      this.currentPeerConfig = conf;
+      if (!this.stack) {
+        this.stack = this.active.listPeers();
+        this.stack.localhost = [localhostConf, {
+          node: 'localhost',
+          port: 8000,
+        }];
+      }
+
+      this.check();
+    }
+
+    setPeerAPIObject(config) {
+      this.active = lisk.api(config);
 
       this.active.getStatusPromise = () => {
         const deferred = $q.defer();
@@ -81,8 +98,6 @@ app.factory('$peers', ($timeout, $cookies, $location, $q) => {
         });
         return deferred.promise;
       };
-
-      this.check();
     }
 
     check() {

src/app/services/peers/peers.js

@@ -37,7 +37,7 @@ module.exports = function (config) {
       noInfo: true,
     },
 
-    // list of files to exclude
+    // List of files to exclude
     exclude: [],
 
     // Rest results reporter to use

src/karma.conf.js

@@ -9,6 +9,8 @@
     "test": "export NODE_ENV=test && karma start; grunt eslint",
     "test-live": "export NODE_ENV=test && export LIVE=true && karma start"
   },
+  "author": "Lisk Foundation <admin@lisk.io>, lightcurve GmbH <admin@lightcurve.io>",
+  "license": "GPL-3.0",
   "dependencies": {
     "angular": "=1.5.8",
     "angular-animate": "=1.5.8",
@@ -21,7 +23,7 @@
     "bitcore-mnemonic": "=1.1.1",
     "debug": "=2.2.0",
     "jquery": "=2.2.4",
-    "lisk-js": "git://github.com/liskHQ/lisk-js.git#61-missing-API-features",
+    "lisk-js": "git://github.com/liskHQ/lisk-js.git#development",
     "lodash": "=4.16.4",
     "moment": "=2.15.1",
     "numeral": "=1.5.3"
@@ -32,6 +34,7 @@
     "babel-loader": "=6.2.4",
     "babel-plugin-istanbul": "^4.0.0",
     "babel-plugin-syntax-trailing-function-commas": "=6.22.0",
+    "babel-plugin-istanbul": "^4.0.0",
     "babel-preset-es2015": "=6.9.0",
     "chai": "=3.5.0",
     "clean-webpack-plugin": "=0.1.9",

src/package.json

@@ -103,7 +103,7 @@ describe('Login controller', () => {
       expect(spy).to.have.been.calledWith();
     });
 
-    it('creates this.listener(ev) which if called repeatedly will gnerate a random this.seed', () => {
+    it('creates this.listener(ev) which if called repeatedly will generate a random this.seed', () => {
       controller.startGenratingNewPassphrase();
       expect(controller.seed).to.deep.equal(['00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00', '00']);
       expect(controller.progress).to.equal(0);