lukechilds
/
bitcore-wallet-service
mirror of https://github.com/lukechilds/bitcore-wallet-service.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix bit cmds: address, addresses, balance, broadcast, confirm, history, reject, rm, send, sign, status & txproposals

activeAddress
Ivan Socolsky 10 years ago
parent
f486ecacd3
commit
f89c863419
15 changed files with 150 additions and 162 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      bit-wallet/bit-address
  2. 22
      bit-wallet/bit-addresses
  3. 9
      bit-wallet/bit-balance
  4. 21
      bit-wallet/bit-broadcast
  5. 41
      bit-wallet/bit-confirm
  6. 57
      bit-wallet/bit-history
  7. 21
      bit-wallet/bit-reject
  8. 28
      bit-wallet/bit-rm
  9. 20
      bit-wallet/bit-send
  10. 28
      bit-wallet/bit-sign
  11. 2
      bit-wallet/bit-status
  12. 45
      bit-wallet/bit-txproposals
  13. 6
      bit-wallet/cli-utils.js
  14. 2
      lib/client/api.js
  15. 1
      lib/client/credentials.js

9
bit-wallet/bit-address
View File

@ -9,8 +9,9 @@ program
.parse(process.argv);
var args = program.args;
var client = utils.getClient(program);
client.createAddress(function(err, x) {
utils.die(err);
console.log('* New Address %s ', x.address);
utils.getClient(program, function (client) {
client.createAddress(function(err, x) {
utils.die(err);
console.log('* New Address %s ', x.address);
});
});

22
bit-wallet/bit-addresses
View File

@ -10,14 +10,20 @@ program
.parse(process.argv);
var args = program.args;
var client = utils.getClient(program);
client.getMainAddresses({
doNotVerify: true
}, function(err, x) {
utils.die(err);
console.log('* Addresses:');
_.each(x, function(a) {
console.log(' ', a.address);
utils.getClient(program, function (client) {
client.getMainAddresses({
doNotVerify: true
}, function(err, x) {
utils.die(err);
if (x.length > 0) {
console.log('* Addresses:');
_.each(x, function(a) {
console.log(' ', a.address);
});
} else {
console.log('* No addresses.');
}
});
});

9
bit-wallet/bit-balance
View File

@ -9,9 +9,10 @@ program
.parse(process.argv);
var args = program.args;
var client = utils.getClient(program);
client.getBalance(function(err, x) {
utils.die(err);
console.log('* Wallet balance %s (Locked %s)', utils.renderAmount(x.totalAmount), utils.renderAmount(x.lockedAmount) );
utils.getClient(program, function (client) {
client.getBalance(function(err, x) {
utils.die(err);
console.log('* Wallet balance %s (Locked %s)', utils.renderAmount(x.totalAmount), utils.renderAmount(x.lockedAmount) );
});
});

21
bit-wallet/bit-broadcast
View File

@ -11,19 +11,16 @@ program
.parse(process.argv);
var args = program.args;
if (!args[0])
program.help();
var txpid = args[0] || '';
var txpid = args[0];
var client = utils.getClient(program);
client.getTxProposals({}, function(err, txps) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
client.broadcastTxProposal(txp, function(err, txid) {
utils.getClient(program, function (client) {
client.getTxProposals({}, function(err, txps) {
utils.die(err);
console.log('Transaction Broadcasted: TXID: ' + x.txid);
var txp = utils.findOneTxProposal(txps, txpid);
client.broadcastTxProposal(txp, function(err, txp) {
utils.die(err);
console.log('Transaction Broadcasted: TXID: ' + txp.txid);
});
});
});

41
bit-wallet/bit-confirm
View File

@ -9,24 +9,27 @@ program = utils.configureCommander(program);
program
.parse(process.argv);
var client = utils.getClient(program);
client.getStatus(function(err, x, myCopayerId) {
utils.die(err);
console.log('\n To be sure that none Copayer has joined more that once to this wallet, you can asked them their confirmation number. They can grab them using this (bit confirm) command.');
console.log('\n * Copayer confirmations ids:');
var myConfirmationId;
_.each(x.wallet.copayers, function(x) {
var confirmationId = utils.confirmationId(x);
if (x.id != myCopayerId)
console.log('\t\t* %s : %s', x.name, confirmationId);
else
myConfirmationId = confirmationId;
utils.getClient(program, function (client) {
client.getStatus(function(err, x) {
utils.die(err);
if (x.wallet.n == 1) {
console.log('Confirmations only work on shared wallets');
process.exit(1);
}
console.log('\n To be sure that no copayer has joined this wallet more than once, you can asked them for their confirmation number. They can get theirs by running the bit-confirm command.');
console.log('\n * Copayer confirmation IDs:');
var myConfirmationId;
_.each(x.wallet.copayers, function(x) {
var confirmationId = utils.confirmationId(x);
if (x.id != client.credentials.copayerId)
console.log('\t\t* %s : %s', x.name, confirmationId);
else
myConfirmationId = confirmationId;
});
console.log('\t\t---');
console.log('\t\tYour confirmation ID: %s', myConfirmationId);
});
console.log('\t\t---');
console.log('\t\tYour confirmation ID: %s', myConfirmationId);
});

57
bit-wallet/bit-history
View File

@ -4,40 +4,39 @@ var _ = require('lodash');
var fs = require('fs');
var moment = require('moment');
var program = require('commander');
var Utils = require('./cli-utils');
program = Utils.configureCommander(program);
var utils = require('./cli-utils');
program = utils.configureCommander(program);
program
.parse(process.argv);
var args = program.args;
var client = Utils.getClient(program);
var txData;
client.getTxHistory({}, function (err, txs) {
if (_.isEmpty(txs))
return;
console.log("* TX History:")
_.each(txs, function(tx) {
var time = moment(tx.time * 1000).fromNow();
var amount = Utils.renderAmount(tx.amount);
var confirmations = tx.confirmations || 0;
var proposal = tx.proposalId ? '["' + tx.message + '" by ' + tx.creatorName + '] ' : '';
switch (tx.action) {
case 'received':
direction = '<=';
break;
case 'moved':
direction = '==';
break;
case 'sent':
direction = '=>';
break;
}
console.log("\t%s: %s %s %s %s(%s confirmations)", time, direction, tx.action, amount, proposal, confirmations);
utils.getClient(program, function (client) {
client.getTxHistory({}, function (err, txs) {
if (_.isEmpty(txs))
return;
console.log("* TX History:")
_.each(txs, function(tx) {
var time = moment(tx.time * 1000).fromNow();
var amount = utils.renderAmount(tx.amount);
var confirmations = tx.confirmations || 0;
var proposal = tx.proposalId ? '["' + tx.message + '" by ' + tx.creatorName + '] ' : '';
switch (tx.action) {
case 'received':
direction = '<=';
break;
case 'moved':
direction = '==';
break;
case 'sent':
direction = '=>';
break;
}
console.log("\t%s: %s %s %s %s(%s confirmations)", time, direction, tx.action, amount, proposal, confirmations);
});
});
});

21
bit-wallet/bit-reject
View File

@ -13,17 +13,18 @@ program
var args = program.args;
var txpid = args[0] || '';
var reason = args[1] || '';
var client = utils.getClient(program);
client.getTxProposals({}, function(err, txps) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
client.rejectTxProposal(txp, reason, function(err, tx) {
utils.getClient(program, function (client) {
client.getTxProposals({}, function(err, txps) {
utils.die(err);
if (tx.status == 'rejected')
console.log('Transaction finally rejected.');
else
console.log('Transaction rejected by you.');
var txp = utils.findOneTxProposal(txps, txpid);
client.rejectTxProposal(txp, reason, function(err, tx) {
utils.die(err);
if (tx.status == 'rejected')
console.log('Transaction finally rejected.');
else
console.log('Transaction rejected by you.');
});
});
});

28
bit-wallet/bit-rm
View File

@ -12,26 +12,20 @@ program
.parse(process.argv);
var args = program.args;
if (!args[0])
program.help();
var txpid = args[0] || '';
var txpid = args[0];
var cli = new Client({
filename: program.config
});
cli.getTxProposals({}, function(err, txps) {
utils.die(err);
if (program.verbose)
console.log('* Raw Server Response:\n', txps); //TODO
utils.getClient(program, function (client) {
client.getTxProposals({}, function(err, txps) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
if (program.verbose)
console.log('* Raw Server Response:\n', txps); //TODO
cli.removeTxProposal(txp, function(err) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
client.removeTxProposal(txp, function(err) {
utils.die(err);
console.log('Transaction removed.');
console.log('Transaction removed.');
});
});
});

20
bit-wallet/bit-send
View File

@ -31,14 +31,14 @@ try {
}
var note = args[2];
var client = utils.getClient(program);
client.sendTxProposal({
toAddress: address,
amount: amount,
message: note
}, function(err, x) {
utils.die(err);
console.log(' * Tx created: ID %s [%s] RequiredSignatures:',
x.id, x.status, x.requiredSignatures);
utils.getClient(program, function (client) {
client.sendTxProposal({
toAddress: address,
amount: amount,
message: note
}, function(err, x) {
utils.die(err);
console.log(' * Tx created: ID %s [%s] RequiredSignatures:',
x.id, x.status, x.requiredSignatures);
});
});

28
bit-wallet/bit-sign
View File

@ -15,9 +15,7 @@ program
var args = program.args;
var txpid = args[0] || '';
var client = utils.getClient(program);
function end(txp) {
function end(client, txp) {
if (program.output) {
client.getSignatures(txp, function(err, signatures) {
utils.die(err);
@ -50,14 +48,16 @@ function end(txp) {
};
if (program.input && program.output) {
var inFile = JSON.parse(fs.readFileSync(program.input));
end(inFile.txps[0]);
} else {
client.getTxProposals({}, function(err, txps) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
utils.die(err);
end(txp);
});
}
utils.getClient(program, function (client) {
if (program.input && program.output) {
var inFile = JSON.parse(fs.readFileSync(program.input));
end(client, inFile.txps[0]);
} else {
client.getTxProposals({}, function(err, txps) {
utils.die(err);
var txp = utils.findOneTxProposal(txps, txpid);
utils.die(err);
end(client, txp);
});
}
});

2
bit-wallet/bit-status
View File

@ -14,7 +14,7 @@ utils.getClient(program, function (client) {
utils.die(err);
var x = res.wallet;
console.log('* Wallet %s [%s]: %d-%d %s ', x.name, x.network, x.m, x.n, x.status);
console.log('* Wallet %s [%s]: %d-of-%d %s ', x.name, x.network, x.m, x.n, x.status);
if (x.status != 'complete')
console.log(' Missing copayers:', x.n - x.copayers.length);

45
bit-wallet/bit-txproposals
View File

@ -7,39 +7,20 @@ var utils = require('./cli-utils');
program = utils.configureCommander(program);
program
.option('-i, --input [filename]', 'use input file instead of server\'s')
.option('-o, --output [filename]', 'write tx to output file')
.option('-o, --output [filename]', 'write tx to output file for offline signing')
.parse(process.argv);
var args = program.args;
var client = utils.getClient(program);
var txData;
function end(err, txps, rawtxps) {
utils.die(err);
if (program.input) {
console.log('\n* From File : %s\n', program.input);
}
utils.renderTxProposals(txps);
if (program.output) {
client.getEncryptedWalletData(function (err, toComplete) {
var txData = {
toComplete: toComplete,
txps: txps,
};
fs.writeFileSync(program.output, JSON.stringify(txData));
console.log(' * Proposals Saved to: %s\n', program.output);
});
}
};
if (program.input) {
var txData = fs.readFileSync(program.input);
txData = JSON.parse(txData);
client.parseTxProposals(txData, end);
} else {
client.getTxProposals({getRawTxps: !!program.output}, end);
}
utils.getClient(program, function (client) {
client.getTxProposals({forAirGapped: !!program.output}, function (err, res) {
utils.die(err);
if (program.output) {
fs.writeFileSync(program.output, JSON.stringify(res));
console.log(' * Tx proposals saved to: %s\n', program.output);
} else {
utils.renderTxProposals(res);
}
});
});

6
bit-wallet/cli-utils.js
View File

@ -195,7 +195,11 @@ Utils.renderTxProposals = function(txps) {
return a.copayerName + ' ' + (a.type == 'accept' ? '✓' : '✗') + (a.comment ? ' (' + a.comment + ')' : '');
}).join('. '));
}
console.log('\t\tMissing signatures: ' + missingSignatures);
if (missingSignatures > 0) {
console.log('\t\tMissing signatures: ' + missingSignatures);
} else {
console.log('\t\tReady to broadcast');
}
});
};

2
lib/client/api.js
View File

@ -344,7 +344,7 @@ API.prototype.getStatus = function(cb) {
self._doGetRequest('/v1/wallets/', function(err, result) {
_processTxps(result.pendingTxps, self.credentials.sharedEncryptingKey);
return cb(err, result, self.credentials.copayerId);
return cb(err, result);
});
};

1
lib/client/credentials.js
View File

@ -17,6 +17,7 @@ var FIELDS = [
'm',
'n',
'walletPrivKey',
'personalEncryptingKey',
'sharedEncryptingKey',
'copayerName',
];

Write Preview
Loading…
Cancel
Save