fix bit client: create, join, status

bit-wallet/bit-create

@@ -8,7 +8,6 @@ program = utils.configureCommander(program);
 
 program
   .option('-t, --testnet', 'Create a Testnet Wallet')
-  .option('-n, --nopasswd [level]', 'Set access for no password usage: none(default), readonly, readwrite, full', 'none')
   .usage('[options] <walletName> <m-n> [copayerName]')
   .parse(process.argv);
 

bit-wallet/bit-join

@@ -7,7 +7,6 @@ program = utils.configureCommander(program);
 
 program
   .usage('[options] <secret> [copayerName]')
-  .option('-n, --nopasswd [level]', 'Set access for no password usage: none(default), readonly, readwrite, full', 'none')
   .parse(process.argv);
 
 var args = program.args;

bit-wallet/bit-status

@@ -9,20 +9,20 @@ program
   .parse(process.argv);
 
 var args = program.args;
-var client = utils.getClient(program);
+utils.getClient(program, function (client) {
+  client.getStatus(function(err, res) {
+    utils.die(err);
 
-client.getStatus(function(err, res) {
+    var x = res.wallet;
-  utils.die(err);
+    console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.network, x.m, x.n, x.status);
 
-  var x = res.wallet;
+    if (x.status != 'complete')
-  console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.network, x.m, x.n, x.status);
+      console.log('  Missing copayers:', x.n - x.copayers.length);
+    console.log('* Copayers:', _.pluck(x.copayers,'name').join(', '));
 
-  if (x.status != 'complete')
+    var x = res.balance;
-    console.log('  Missing copayers:', x.n - x.copayers.length);
+    console.log('* Balance %s (Locked: %s)', utils.renderAmount(x.totalAmount), utils.renderAmount(x.lockedAmount));
-  console.log('* Copayers:', _.pluck(x.copayers,'name').join(', '));
 
-  var x = res.balance;
+    utils.renderTxProposals(res.pendingTxps);
-  console.log('* Balance %s (Locked: %s)', utils.renderAmount(x.totalAmount), utils.renderAmount(x.lockedAmount));
+  });
-
-  utils.renderTxProposals(res.pendingTxps);
 });

bit-wallet/cli-utils.js

@@ -2,6 +2,7 @@ var _ = require('lodash');
 var Client = require('../lib/client');
 var FileStorage = require('./filestorage');
 var read = require('read')
+var log = require('npmlog');
 
 var Utils = function() {};
 
@@ -50,10 +51,19 @@ Utils.getClient = function(args, cb) {
   });
   storage.load(function(err, walletData) {
     if (err && err.code != 'ENOENT') die(err);
-    if (walletData) {
+    if (!walletData) return cb(client);
-      client.import(walletData);
+
-    }
+    client.import(walletData);
-    return cb(client);
+    client.openWallet(function(err, justCompleted) {
+      if (client.isComplete() && justCompleted) {
+        Utils.saveClient(args, client, function() {
+          log.info('Your wallet has just been completed. Please backup your wallet file or use the export command.');
+          return cb(client);
+        });
+      } else {
+        return cb(client);
+      }
+    });
   });
 };
 

lib/client/api.js

@@ -329,7 +329,7 @@ API.prototype.joinWallet = function(secret, copayerName, cb) {
 };
 
 API.prototype.getStatus = function(cb) {
-  $.checkState(this.credentials && this.credentials.isComplete());
+  $.checkState(this.credentials);
   var self = this;
 
   self._doGetRequest('/v1/wallets/', function(err, result) {

test/integration/client.js

@@ -324,6 +324,7 @@ describe('client API ', function() {
         });
       });
     });
+    it.skip('should return wallet status even if wallet is not yet complete', function(done) {});
   });
 
   describe('Address Creation', function() {