validate sys and eth addresses on input

Author: jagdeep sidhu

src/wizard/Step1EthToSys.js

@@ -387,6 +387,16 @@ class Step1ES extends Component {
     let fromAccount = userInput.sysxFromAccount;
     let assetGUID = userInput.toSysAssetGUID;
     let syscoinWitnessAddress = userInput.syscoinWitnessAddress;
+    try {
+      sjs.utils.bitcoinjs.address.toOutputScript(syscoinWitnessAddress, CONFIGURATION.SysNetwork)
+    } catch (e) {
+      console.log('e ' + e.message, " address " + syscoinWitnessAddress)
+      validateNewInput.buttonVal = false;
+      validateNewInput.buttonValMsg = this.props.t("step1FSInvalidDestination");
+      this.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));
+      this.setState({working: false});
+      return;
+    } 
     let allowance = web3.utils.toBN(0);
     if (assetGUID !== CONFIGURATION.SYSXAsset) {
       allowance = await contractBase.methods.allowance(fromAccount, CONFIGURATION.ERC20Manager).call();

src/wizard/Step1SysToEth.js

@@ -1,8 +1,10 @@
 
 import React, { Component } from 'react';
 import CONFIGURATION from '../config';
+import Web3 from 'web3';
 const satoshibitcoin = require("satoshi-bitcoin");
-const sjs = require('syscoinjs-lib')
+const sjs = require('syscoinjs-lib');
+const web3 = new Web3(Web3.givenProvider);
 class Step1 extends Component {
   constructor(props) {
     super(props);
@@ -137,14 +139,20 @@ class Step1 extends Component {
     if(!userInput.ethaddress || userInput.ethaddress === ""){
       validateNewInput.ethaddressVal = false;
       valid = false;
-    }         
+    }
+    if (!web3.utils.isAddress(userInput.ethaddress)) {
+      validateNewInput.buttonVal = false;
+      validateNewInput.buttonValMsg = this.props.t("step1FSInvalidDestination");
+      self.setState({working: false});
+      self.setState(Object.assign(userInput, validateNewInput, this._validationErrors(validateNewInput)));  
+      return;
+    }  
     let self = this;
 
     if(valid === true){
       this.setState({working: true});
       if(userInput.asset.length > 0 && userInput.asset !== 0 && userInput.asset !== "0"){
         let assetGuid = userInput.asset.toString();
-        
         let ethAddressStripped = userInput.ethaddress.toString();
         if(ethAddressStripped && ethAddressStripped.startsWith("0x")){
           ethAddressStripped = ethAddressStripped.substr(2, ethAddressStripped.length);