Sgn msg from testnet.

Author: cloneearth

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BITBOX",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "A development framework for Bitcoin Cash",
   "main": "main.js",
   "productName": "BITBOX",
@@ -30,7 +30,7 @@
     "babel-preset-react": "^6.24.1",
     "babel-register": "^6.26.0",
     "bchaddrjs": "^0.1.4",
-    "bitbox-cli": "0.3.17",
+    "bitbox-cli": "0.3.18",
     "bitcoinjs-lib": "^3.3.2",
     "bitcoinjs-message": "^2.0.0",
     "body-parser": "^1.18.2",

src/components/SignAndVerify.js

@@ -38,8 +38,9 @@ class SignAndVerify extends Component {
       this.props.updateValue('message1Error', privateKeyWIF);
       return false;
     }
-    let signature = BitcoinCash.signMessage(this.props.signAndVerify.message1, privateKeyWIF);
-    this.props.updateValue('signature1', signature.toString('base64'));
+
+    let signature = bitbox.BitcoinCash.signMessageWithPrivKey(privateKeyWIF, this.props.signAndVerify.message1);
+    this.props.updateValue('signature1', signature);
   }
 
   verifyMessage() {

src/utilities/BitcoinCash.js

@@ -3,50 +3,28 @@ import Address from '../models/Address';
 import Bitcoin from 'bitcoinjs-lib';
 let BITBOXCli = require('bitbox-cli/lib/bitboxcli').default;
 let bitbox = new BITBOXCli();
-
+import underscore from 'underscore';
 
 class BitcoinCash {
-  static signMessage(message, privateKeyWIF) {
-
-    let keyPair;
-    let errorMsg = '';
-    try {
-      keyPair = bitbox.BitcoinCash.fromWIF(privateKeyWIF);
-    } catch (e) {
-      errorMsg = e.message;
-    }
-
-    if(errorMsg !== '') {
-      return errorMsg;
-    }
-
-    let privateKey = keyPair.d.toBuffer(32);
-    let signature = BitcoinCash.sign(message, privateKeyWIF);
-    let signature1 = signature.toString('base64')
-    return signature1;
-  }
-
-  static sign(message, privateKeyWIF) {
-    return bitbox.BitcoinCash.signMessageWithPrivKey(privateKeyWIF, message);
-  }
-
   static returnPrivateKeyWIF(pubAddress, addresses) {
+    let encoding;
+    if(bitbox.BitcoinCash.isCashAddress(pubAddress)) {
+      encoding = 'cashAddr';
+    } else {
+      encoding = 'legacy';
+    }
     let privateKeyWIF;
     let errorMsg = '';
     try {
-      addresses.forEach((address, index) => {
-        if(bitbox.BitcoinCash.toLegacyAddress(pubAddress) === bitbox.BitcoinCash.fromWIF(address.privateKeyWIF).getAddress()) {
-          privateKeyWIF = address.privateKeyWIF;
-        }
-      });
+      privateKeyWIF = (encoding === 'cashAddr') ? underscore.findWhere(addresses, ({cashAddr: pubAddress})) : underscore.findWhere(addresses, ({legacy: pubAddress}));
     } catch (e) {
       errorMsg = e.message;
     }
 
     if(errorMsg !== '') {
       return errorMsg;
     } else {
-      return privateKeyWIF;
+      return privateKeyWIF.privateKeyWIF;
     }
   }
 

src/utilities/Server.js

@@ -1331,8 +1331,8 @@ class Server {
       }
 
       let message = req.body.params[1];
-      let signature = BitcoinCash.signMessage(message, privateKeyWIF);
-      res.send(signature.toString('base64'));
+      let signature = bitbox.BitcoinCash.signMessageWithPrivKey(privateKeyWIF, message);
+      res.send(signature);
     });
 
     server.post('/signmessagewithprivkey', (req, res) => {