Merge pull request #63 from matiu/v/0.10

V/0.10

Author: matiu

bin/wallet-balance

@@ -3,16 +3,22 @@
 var program = require('commander');
 var utils = require('./cli-utils');
 program = utils.configureCommander(program);
-
 program
+  .option('-c, --coin <coin>', 'coin (btc/bch)')
   .parse(process.argv);
 
 var args = program.args;
 
+
+var opts = {};
+if (program.coin) { 
+    opts.coin = program.coin
+}
+
 utils.getClient(program, {
   mustExist: true
 }, function(client) {
-  client.getBalance({}, function(err, x) {
+  client.getBalance(opts, function(err, x) {
     utils.die(err);
     console.log('* Wallet balance %s (Locked %s)', utils.renderAmount(x.totalAmount), utils.renderAmount(x.lockedAmount));
   });

bin/wallet-create

@@ -8,6 +8,7 @@ program = utils.configureCommander(program);
 program
   .option('-t, --testnet', 'Create a Testnet Wallet')
   .option('-p, --password', 'Encrypt wallet. Will ask password interactively')
+  .option('-c, --coin <coin>', 'coin (btc/bch)')
   .usage('[options] <walletName> <m-n> [copayerName] <passphrase>')
   .parse(process.argv);
 
@@ -19,6 +20,7 @@ var walletName = args[0];
 var copayerName = args[2] || process.env.USER;
 var passphrase = args[3];
 var network = program.testnet ? 'testnet' : 'livenet';
+var coin  = program.coin ? program.coin : 'btc';
 
 var mn;
 try {
@@ -34,6 +36,7 @@ utils.getClient(program, {
     network: network,
     passphrase: passphrase,
     language: 'en',
+    coin: coin,
   });
   client.createWallet(walletName, copayerName, mn[0], mn[1], {
     network: network

bin/wallet-import

@@ -50,7 +50,7 @@ utils.getClient(program, {
       passphrase: passphrase,
     }, function(err) {
       if (err)
-        utils.die('Could not import');
+        utils.die('Could not import' + err);
 
       utils.saveClient(program, client, function() {
         var access = client.canSign() ? 'with signing capability' : 'without signing capability';

package.json

@@ -2,7 +2,7 @@
   "name": "bitcore-wallet",
   "description": "A CLI Mutisig HD Bitcoin Wallet, demo for Bitcore Wallet Service",
   "author": "BitPay Inc",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "keywords": [
     "bitcoin",
     "copay",
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "async": "^2.5.0",
-    "bitcore-wallet-client": "5.4.0",
+    "bitcore-wallet-client": "6.4.0",
     "commander": "^2.6.0",
     "lodash": "^3.3.1",
     "moment": "^2.9.0",
@@ -37,13 +37,16 @@
     "test": "./node_modules/.bin/mocha",
     "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
   },
-  "contributors": [{
-    "name": "Ivan Socolsky",
-    "email": "ivan@gmail.com"
-  }, {
-    "name": "Matias Alejo Garcia",
-    "email": "ematiu@gmail.com"
-  }],
+  "contributors": [
+    {
+      "name": "Ivan Socolsky",
+      "email": "ivan@gmail.com"
+    },
+    {
+      "name": "Matias Alejo Garcia",
+      "email": "ematiu@gmail.com"
+    }
+  ],
   "bin": {
     "wallet": "./bin/wallet",
     "wallet-address": "./bin/wallet-address",
@@ -67,5 +70,6 @@
     "wallet-txproposals": "./bin/wallet-txproposals",
     "wallet-mnemonic": "./bin/wallet-mnemonic",
     "wallet-derive": "./bin/wallet-derive"
-  }
+  },
+  "licence": "MIT"
 }