Update dependencies

README.md

@@ -1,10 +1,12 @@
-[![Build Status](https://travis-ci.com/ZencashOfficial/myzenwallet.svg?branch=master)](https://travis-ci.com/ZencashOfficial/myzenwallet) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/zencashofficial/myzenwallet)](https://github.com/ZencashOfficial/myzenwallet/releases/latest) [![GitHub All Releases](https://img.shields.io/github/downloads/zencashofficial/myzenwallet/total)](https://github.com/ZencashOfficial/myzenwallet/releases/latest)
+[![Build Status](https://travis-ci.com/HorizenOfficial/myzenwallet.svg?branch=master)](https://travis-ci.com/HorizenOfficial/myzenwallet) [![GitHub release (latest by date)](https://img.shields.io/github/v/release/HorizenOfficial/myzenwallet)](https://github.com/HorizenOfficial/myzenwallet/releases/latest) [![GitHub All Releases](https://img.shields.io/github/downloads/zencashofficial/myzenwallet/total)](https://github.com/HorizenOfficial/myzenwallet/releases/latest)
 # myzenwallet
 
 MyZENWallet is a client-side browser-based wallet for Zen.
 
 ### Running locally
-Download the latest release tarball [here](https://github.com/ZencashOfficial/myzenwallet/releases/latest), extract it, goto the `dist` folder and double click `index.html`
+Download the latest release tarball [here](https://github.com/HorizenOfficial/myzenwallet/releases/latest), extract it, goto the `dist` folder and double click `index.html`
+
+Alternative: If you have node.js installed it may be used to run a local web server. Extract as above, goto the `dist` folder, open a command window and run `node localserver`. Open a browser window to `localhost:8080`
 
 ### Dev
 ```shell

app/components/faq.jsx

@@ -19,7 +19,7 @@ export default class ZFaq extends React.Component {
 
             <p>
               <b>Q: Can I have the source code?</b><br/>
-              A: <a href="https://github.com/zencashofficial/myzenwallet">Here you go</a>
+              A: <a href="https://github.com/HorizenOfficial/myzenwallet">Here you go</a>
             </p>               
 
             <p>

app/components/footer.jsx

@@ -31,7 +31,7 @@ export default class ZFooter extends React.Component {
             <a href="https://horizen.global/">website</a><br/>
             <a href="https://blog.horizen.global/">blog</a><br/>
             <a href="https://forum.horizen.global/">forum</a><br/>
-            <a href="https://github.com/ZencashOfficial/">github</a><br/>
+            <a href="https://github.com/HorizenOfficial/">github</a><br/>
             <a href="https://discordapp.com/invite/Hu5mQxR">discord</a><br/>
           </Col>
         </Row>

app/components/navbar.jsx

@@ -20,8 +20,8 @@ export default class ZNavbar extends React.Component {
   render () {
     return (
       <Navbar color="light" light expand="md">
-        <NavbarBrand href='/'>
-          <img src="/favicon.ico" alt="myzenwallet.io" height={42}/>&nbsp;myzenwallet.io
+        <NavbarBrand href={window.location.pathname}>
+          <img src="./favicon.ico" alt="myzenwallet.io" height={42}/>&nbsp;myzenwallet
         </NavbarBrand>
         <NavbarToggler onClick={this.toggleNavbar} />
         <Collapse isOpen={this.state.isOpen} navbar>
@@ -32,12 +32,12 @@ export default class ZNavbar extends React.Component {
               </NavLink>
             </NavItem>
             <NavItem>
-              <NavLink href='/faq.html'>
+              <NavLink href='./faq.html'>
                 FAQ
               </NavLink>
             </NavItem>
             <NavItem>
-              <NavLink href='/guide.html'>
+              <NavLink href='./guide.html'>
                 GETTING STARTED
               </NavLink>
             </NavItem>

app/components/wallet.jsx

@@ -920,7 +920,7 @@ class ZSendZEN extends React.Component {
     Object.keys(this.props.publicAddresses).forEach(function (key) {
       if (key !== undefined) {
         sendAddresses.push(
-          <option value={key}>[{this.props.publicAddresses[key].confirmedBalance}] - {key}</option>
+          <option key={key.substr(0,8)} value={key}>[{this.props.publicAddresses[key].confirmedBalance}] - {key}</option>
         )
       }
     }.bind(this))
@@ -1031,7 +1031,7 @@ class ZPrintableKeys extends React.Component {
     Object.keys(this.props.publicAddresses).forEach(function (key) {
       if (key !== undefined) {
         sendAddresses.push(
-          <option value={key}>[{this.props.publicAddresses[key].confirmedBalance}] - {key}</option>
+          <option key={key.substr(0,8)} value={key}>[{this.props.publicAddresses[key].confirmedBalance}] - {key}</option>
         )
       }
     }.bind(this))
@@ -1103,7 +1103,7 @@ class ZSignMessage extends React.Component {
     Object.keys(publicAddresses).forEach(function (key) {
       if (key !== undefined) {
         addrOptions.push(
-          <option value={zencashjs.address.WIFToPrivKey(publicAddresses[key].privateKeyWIF)}>{key}</option>
+          <option key={key.substr(0,8)} value={zencashjs.address.WIFToPrivKey(publicAddresses[key].privateKeyWIF)}>{key}</option>
         )
       }
     });
@@ -1142,7 +1142,7 @@ class ZSignMessage extends React.Component {
               <Button color="secondary" size="sm" className="ml-2"><MdContentCopy /></Button>
             </CopyToClipboard>
           </Label>
-          <Input type="textarea" rows={3} value={this.state.signature} readonly="readonly"/>
+          <Input type="textarea" rows={3} value={this.state.signature} readOnly="readonly"/>
         </FormGroup>
 
       </div>
@@ -1338,7 +1338,7 @@ export default class ZWallet extends React.Component {
       }
 
       for (var i = 0; i < this.state.privateKeys.length; i++) {
-        const pubKeyHash = this.state.settings.useTestNet ? zencashjs.config.testnet.wif : zencashjs.config.mainnet.wif
+        const wif = this.state.settings.useTestNet ? zencashjs.config.testnet.wif : zencashjs.config.mainnet.wif
 
         var c_pk_wif;
         var c_pk = this.state.privateKeys[i]
@@ -1349,10 +1349,9 @@ export default class ZWallet extends React.Component {
           c_pk = zencashjs.address.WIFToPrivKey(c_pk)
         }
         else {
-          c_pk_wif = zencashjs.address.privKeyToWIF(c_pk)
+          c_pk_wif = zencashjs.address.privKeyToWIF(c_pk, true, wif)
         }
 
-        var c_pk_wif = zencashjs.address.privKeyToWIF(c_pk, true, pubKeyHash)
         const c_addr = _privKeyToAddr(c_pk, this.state.settings.compressPubKey, this.state.settings.useTestNet)
 
         publicAddresses[c_addr] = {

app/faq.js

@@ -6,9 +6,7 @@ import ReactDOM from 'react-dom';
 import ZNavbar from './components/navbar.jsx'
 import ZFaq from './components/faq.jsx'
 import ZFooter from './components/footer.jsx'
-import ZGoogleAnalytics from "./components/googleAnalytics.jsx";
 
 ReactDOM.render(<ZNavbar />, document.getElementById('navbar'));
 ReactDOM.render(<ZFaq />, document.getElementById('page-content'));
 ReactDOM.render(<ZFooter />, document.getElementById('footer'));
-ReactDOM.render(<ZGoogleAnalytics />, document.getElementById('GoogleAnalytics'));

app/guide.js

@@ -6,9 +6,7 @@ import ReactDOM from 'react-dom';
 import ZNavbar from './components/navbar.jsx'
 import ZGuide from './components/guide.jsx'
 import ZFooter from './components/footer.jsx'
-import ZGoogleAnalytics from "./components/googleAnalytics.jsx";
 
 ReactDOM.render(<ZNavbar />, document.getElementById('navbar'));
 ReactDOM.render(<ZGuide />, document.getElementById('page-content'));
 ReactDOM.render(<ZFooter />, document.getElementById('footer'));
-ReactDOM.render(<ZGoogleAnalytics />, document.getElementById('GoogleAnalytics'));

app/index.html

@@ -6,12 +6,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Content-Security-Policy" content="
       default-src 'none';
-      connect-src <%= htmlWebpackPlugin.options.customLocalDomain %>;
-      img-src 'self' https://www.google-analytics.com;
-      script-src 'self' https://www.google-analytics.com/analytics.js;
+      connect-src 'self' <%= htmlWebpackPlugin.options.customLocalDomain %>;
+      img-src 'self';
+      script-src 'self';
       style-src 'unsafe-inline'
     ">
-    <link rel="shortcut icon" href="./favicon.ico">
+    <link rel="shortcut icon" href="<%= htmlWebpackPlugin.options.iconRef %>">
     <title>MyZenWallet</title>
     <style>
         body {
@@ -37,8 +37,6 @@
     </div>
 
     <div id="footer"></div>
-
-    <div id="GoogleAnalytics"></div>
 </body>
 
 </html>

app/index.js

@@ -6,9 +6,7 @@ import ReactDOM from 'react-dom';
 import ZNavbar from './components/navbar.jsx'
 import ZWallet from './components/wallet.jsx'
 import ZFooter from './components/footer.jsx'
-import ZGoogleAnalytics from "./components/googleAnalytics.jsx";
 
 ReactDOM.render(<ZNavbar />, document.getElementById('navbar'));
 ReactDOM.render(<ZWallet />, document.getElementById('page-content'));
 ReactDOM.render(<ZFooter />, document.getElementById('footer'));
-ReactDOM.render(<ZGoogleAnalytics />, document.getElementById('GoogleAnalytics'));

deploy.sh

@@ -12,7 +12,7 @@ yarn run build
 mkdir .deploy
 cd .deploy
 git init
-git remote add origin [email protected]:ZencashOfficial/myzenwallet.git
+git remote add origin [email protected]:HorizenOfficial/myzenwallet.git
 
 # Add built site files
 cp -r ../dist/* .

dist/faq.html

@@ -1,20 +1,4 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Content-Security-Policy" content="
-      default-src 'none';
-      connect-src https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io;
-      img-src 'self' https://www.google-analytics.com;
-      script-src 'self' https://www.google-analytics.com/analytics.js;
-      style-src 'unsafe-inline'
-    ">
-    <link rel="shortcut icon" href="./favicon.ico">
-    <title>MyZenWallet</title>
-    <style>
-        body {
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="Content-Security-Policy" content=" default-src 'none'; connect-src 'self' https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io; img-src 'self'; script-src 'self'; style-src 'unsafe-inline' "><link rel="shortcut icon" href="./favicon.ico"><title>MyZenWallet</title><style>body {
             display: flex;
             min-height: 100vh;
             flex-direction: column;
@@ -25,20 +9,4 @@
             display: flex;
             align-items: center;
             justify-content: center;
-        }
-    </style>
-<link rel="shortcut icon" href="favicon.ico"></head>
-
-<body>
-    <div id="navbar"></div>
-
-    <div class="aligner">
-        <div id="page-content"></div>
-    </div>
-
-    <div id="footer"></div>
-
-    <div id="GoogleAnalytics"></div>
-<script type="text/javascript" src="js/faq.js"></script></body>
-
-</html>
+        }</style><link rel="icon" href="favicon.ico"></head><body><div id="navbar"></div><div class="aligner"><div id="page-content"></div></div><div id="footer"></div><script defer="defer" src="js/faq.js"></script></body></html>

dist/guide.html

@@ -1,20 +1,4 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Content-Security-Policy" content="
-      default-src 'none';
-      connect-src https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io;
-      img-src 'self' https://www.google-analytics.com;
-      script-src 'self' https://www.google-analytics.com/analytics.js;
-      style-src 'unsafe-inline'
-    ">
-    <link rel="shortcut icon" href="./favicon.ico">
-    <title>MyZenWallet</title>
-    <style>
-        body {
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="Content-Security-Policy" content=" default-src 'none'; connect-src 'self' https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io; img-src 'self'; script-src 'self'; style-src 'unsafe-inline' "><link rel="shortcut icon" href="./favicon.ico"><title>MyZenWallet</title><style>body {
             display: flex;
             min-height: 100vh;
             flex-direction: column;
@@ -25,20 +9,4 @@
             display: flex;
             align-items: center;
             justify-content: center;
-        }
-    </style>
-<link rel="shortcut icon" href="favicon.ico"></head>
-
-<body>
-    <div id="navbar"></div>
-
-    <div class="aligner">
-        <div id="page-content"></div>
-    </div>
-
-    <div id="footer"></div>
-
-    <div id="GoogleAnalytics"></div>
-<script type="text/javascript" src="js/guide.js"></script></body>
-
-</html>
+        }</style><link rel="icon" href="favicon.ico"></head><body><div id="navbar"></div><div class="aligner"><div id="page-content"></div></div><div id="footer"></div><script defer="defer" src="js/guide.js"></script></body></html>

dist/index.html

@@ -1,20 +1,4 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Content-Security-Policy" content="
-      default-src 'none';
-      connect-src https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io;
-      img-src 'self' https://www.google-analytics.com;
-      script-src 'self' https://www.google-analytics.com/analytics.js;
-      style-src 'unsafe-inline'
-    ">
-    <link rel="shortcut icon" href="./favicon.ico">
-    <title>MyZenWallet</title>
-    <style>
-        body {
+<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><meta http-equiv="Content-Security-Policy" content=" default-src 'none'; connect-src 'self' https://explorer.horizen.global https://explorer.zensystem.io https://explorer-testnet.horizen.global https://explorer-testnet.zensystem.io; img-src 'self'; script-src 'self'; style-src 'unsafe-inline' "><link rel="shortcut icon" href="./favicon.ico"><title>MyZenWallet</title><style>body {
             display: flex;
             min-height: 100vh;
             flex-direction: column;
@@ -25,20 +9,4 @@
             display: flex;
             align-items: center;
             justify-content: center;
-        }
-    </style>
-<link rel="shortcut icon" href="favicon.ico"></head>
-
-<body>
-    <div id="navbar"></div>
-
-    <div class="aligner">
-        <div id="page-content"></div>
-    </div>
-
-    <div id="footer"></div>
-
-    <div id="GoogleAnalytics"></div>
-<script type="text/javascript" src="js/index.js"></script></body>
-
-</html>
+        }</style><link rel="icon" href="favicon.ico"></head><body><div id="navbar"></div><div class="aligner"><div id="page-content"></div></div><div id="footer"></div><script defer="defer" src="js/index.js"></script></body></html>

dist/js/faq.js.LICENSE.txt

@@ -5,11 +5,18 @@ object-assign
 */
 
 /*!
-  Copyright (c) 2017 Jed Watson.
+  Copyright (c) 2018 Jed Watson.
   Licensed under the MIT License (MIT), see
   http://jedwatson.github.io/classnames
 */
 
+/*!
+ * The buffer module from node.js, for the browser.
+ *
+ * @author   Feross Aboukhadijeh <[email protected]> <http://feross.org>
+ * @license  MIT
+ */
+
 /** @license React v0.19.1
  * scheduler.production.min.js
  *
@@ -19,7 +26,7 @@ object-assign
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
+/** @license React v16.14.0
  * react-dom.production.min.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -28,7 +35,7 @@ object-assign
  * LICENSE file in the root directory of this source tree.
  */
 
-/** @license React v16.13.1
+/** @license React v16.14.0
  * react.production.min.js
  *
  * Copyright (c) Facebook, Inc. and its affiliates.