Merge branch 'master' into release

Author: adityapk00

.eslintrc.js

@@ -6,5 +6,16 @@ module.exports = {
         config: require.resolve('./configs/webpack.config.eslint.js')
       }
     }
-  }
+  },
+  overrides: [
+    {
+      files: [
+        "**/*.test.js"
+      ],
+      env: {
+        jest: true // now **/*.test.js files' env has both es6 *and* jest
+      },
+      plugins: ["jest"],
+    }
+  ]
 }

README.md

@@ -14,13 +14,13 @@ Head over to the releases page and grab the latest installers or binary. https:/
 If you are on Debian/Ubuntu, please download the '.AppImage' package and just run it.
 
 ```
-./Zecwallet.Fullnode-0.9.18.AppImage
+./Zecwallet.Fullnode-0.9.19.AppImage
 ```
 
 If you prefer to install a `.deb` package, that is also available.
 
 ```
-sudo apt install -f ./zecwallet_0.9.18_amd64.deb
+sudo apt install -f ./zecwallet_0.9.19_amd64.deb
 ```
 
 ### Windows

app/Routes.js

@@ -26,6 +26,7 @@ import AppState, {
 } from './components/AppState';
 import RPC from './rpc';
 import Utils from './utils/utils';
+import { ZcashURITarget } from './utils/uris';
 import Zcashd from './components/Zcashd';
 import AddressBook from './components/Addressbook';
 import AddressbookImpl from './utils/AddressbookImpl';
@@ -225,24 +226,34 @@ export default class RouteApp extends React.Component<Props, AppState> {
     }
   };
 
-  setSendTo = (address: string, amount: number | null, memo: string | null) => {
+  setSendTo = (targets: ZcashURITarget[] | ZcashURITarget) => {
     // Clear the existing send page state and set up the new one
     const { sendPageState } = this.state;
 
     const newSendPageState = new SendPageState();
+    newSendPageState.toaddrs = [];
     newSendPageState.fromaddr = sendPageState.fromaddr;
 
-    const to = new ToAddr(Utils.getNextToAddrID());
-    if (address) {
-      to.to = address;
+    // If a single object is passed, accept that as well.
+    let tgts = targets;
+    if (!Array.isArray(tgts)) {
+      tgts = [targets];
     }
-    if (amount) {
-      to.amount = amount;
-    }
-    if (memo) {
-      to.memo = memo;
-    }
-    newSendPageState.toaddrs = [to];
+
+    tgts.forEach(tgt => {
+      const to = new ToAddr(Utils.getNextToAddrID());
+      if (tgt.address) {
+        to.to = tgt.address;
+      }
+      if (tgt.amount) {
+        to.amount = tgt.amount;
+      }
+      if (tgt.memoString) {
+        to.memo = tgt.memoString;
+      }
+
+      newSendPageState.toaddrs.push(to);
+    });
 
     this.setState({ sendPageState: newSendPageState });
   };

app/companion.js

@@ -389,7 +389,7 @@ export default class CompanionAppListener {
       maxzspendable,
       tokenName,
       zecprice,
-      serverversion: '0.9.18'
+      serverversion: '0.9.19'
     };
 
     return JSON.stringify(resp);

app/components/Addressbook.js

@@ -33,7 +33,7 @@ const AddressBookItemInteral = ({ item, removeAddressBookEntry, setSendTo, histo
             type="button"
             className={cstyles.primarybutton}
             onClick={() => {
-              setSendTo(item.address, null, null);
+              setSendTo(new ZcashURITarget(item.address, null, null));
               history.push(routes.SEND);
             }}
           >
@@ -53,7 +53,7 @@ type Props = {
   addressBook: AddressBookEntry[],
   addAddressBookEntry: (label: string, address: string) => void,
   removeAddressBookEntry: (label: string) => void,
-  setSendTo: (address: string, amount: number | null, memo: string | null) => void
+  setSendTo: (targets: ZcashURITarget[] | ZcashURITarget) => void
 };
 
 type State = {

app/components/Sidebar.js

@@ -4,8 +4,6 @@
 /* eslint-disable react/prop-types */
 import React, { PureComponent } from 'react';
 import type { Element } from 'react';
-import url from 'url';
-import querystring from 'querystring';
 import fs from 'fs';
 import dateformat from 'dateformat';
 import Modal from 'react-modal';
@@ -20,6 +18,7 @@ import routes from '../constants/routes.json';
 import Logo from '../assets/img/logobig.png';
 import { Info, Transaction } from './AppState';
 import Utils from '../utils/utils';
+import { parseZcashURI, ZcashURITarget } from '../utils/uris';
 
 const ExportPrivKeyModal = ({ modalIsOpen, exportedPrivKeys, closeModal }) => {
   return (
@@ -184,7 +183,7 @@ type Props = {
   info: Info,
   addresses: string[],
   transactions: Transaction[],
-  setSendTo: (address: string, amount: number | null, memo: string | null) => void,
+  setSendTo: (targets: ZcashURITarget[] | ZcashURITarget) => void,
   getPrivKeyAsString: (address: string) => string,
   importPrivKeys: (keys: string[]) => void,
   history: PropTypes.object.isRequired,
@@ -226,7 +225,7 @@ class Sidebar extends PureComponent<Props, State> {
       openErrorModal(
         'Zecwallet Fullnode',
         <div className={cstyles.verticalflex}>
-          <div className={cstyles.margintoplarge}>Zecwallet Fullnode v0.9.18</div>
+          <div className={cstyles.margintoplarge}>Zecwallet Fullnode v0.9.19</div>
           <div className={cstyles.margintoplarge}>Built with Electron. Copyright (c) 2018-2020, Aditya Kulkarni.</div>
           <div className={cstyles.margintoplarge}>
             The MIT License (MIT) Copyright (c) 2018-present Zecwallet
@@ -256,9 +255,11 @@ class Sidebar extends PureComponent<Props, State> {
     // Donate button
     ipcRenderer.on('donate', () => {
       setSendTo(
-        Utils.getDonationAddress(testnet),
-        Utils.getDefaultDonationAmount(testnet),
-        Utils.getDefaultDonationMemo(testnet)
+        new ZcashURITarget(
+          Utils.getDonationAddress(testnet),
+          Utils.getDefaultDonationAmount(testnet),
+          Utils.getDefaultDonationMemo(testnet)
+        )
       );
 
       history.push(routes.SEND);
@@ -418,41 +419,27 @@ class Sidebar extends PureComponent<Props, State> {
     const { openErrorModal, setSendTo, history } = this.props;
 
     const errTitle = 'URI Error';
-    const errBody = (
-      <span>
-        The URI &quot;{escape(uri)}&quot; was not recognized.
-        <br />
-        Please type in a valid URI of the form &quot; zcash:address?amout=xx&memo=yy &quot;
-      </span>
-    );
+    const getErrorBody = (explain: string): Element<'div'> => {
+      return (
+        <div>
+          <span>{explain}</span>
+          <br />
+        </div>
+      );
+    };
 
     if (!uri || uri === '') {
-      openErrorModal(errTitle, errBody);
+      openErrorModal(errTitle, getErrorBody('URI was not found or invalid'));
       return;
     }
 
-    const parsedUri = url.parse(uri);
-    if (!parsedUri || parsedUri.protocol !== 'zcash:' || !parsedUri.query) {
-      openErrorModal(errTitle, errBody);
+    const parsedUri = parseZcashURI(uri);
+    if (typeof parsedUri === 'string') {
+      openErrorModal(errTitle, getErrorBody(parsedUri));
       return;
     }
 
-    const address = parsedUri.host;
-    if (!address || !(Utils.isTransparent(address) || Utils.isZaddr(address))) {
-      openErrorModal(errTitle, <span>The address ${address} was not recognized as a Zcash address</span>);
-      return;
-    }
-
-    const parsedParams = querystring.parse(parsedUri.query);
-    if (!parsedParams || (!parsedParams.amt && !parsedParams.amount)) {
-      openErrorModal(errTitle, errBody);
-      return;
-    }
-
-    const amount = parsedParams.amt || parsedParams.amount;
-    const memo = parsedParams.memo || '';
-
-    setSendTo(address, amount, memo);
+    setSendTo(parsedUri);
     history.push(routes.SEND);
   };
 

app/components/Transactions.js

@@ -54,7 +54,7 @@ const TxModalInternal = ({ modalIsOpen, tx, closeModal, currencyName, zecPrice,
   };
 
   const doReply = (address: string) => {
-    setSendTo(address, 0.0001, null);
+    setSendTo(new ZcashURITarget(address, 0.0001, null));
     closeModal();
 
     history.push(routes.SEND);
@@ -251,7 +251,7 @@ type Props = {
   transactions: Transaction[],
   addressBook: AddressBook[],
   info: Info,
-  setSendTo: (string, number | null, string | null) => void
+  setSendTo: (targets: ZcashURITarget[] | ZcashURITarget) => void
 };
 
 type State = {

app/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zecwallet",
   "productName": "Zecwallet Fullnode",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "Zecwallet Fullnode",
   "main": "./main.prod.js",
   "author": {