From 7de9a95dd0a054684c965e1958db39a9437b3541 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Fri, 13 Feb 2015 16:07:47 -0300 Subject: [PATCH] rename clientlib --- app.js | 4 +++- bit-wallet/bit-send | 10 +++++----- bit-wallet/bit-sign | 33 +++++++++++++++++++++++++++++++++ bit-wallet/bit-status | 8 ++++++++ lib/clientlib.js | 2 +- package.json | 1 + 6 files changed, 51 insertions(+), 7 deletions(-) create mode 100644 bit-wallet/bit-sign diff --git a/app.js b/app.js index 2ece691..d623be6 100644 --- a/app.js +++ b/app.js @@ -39,6 +39,9 @@ app.use(bodyParser.json({ limit: POST_LIMIT })); +app.use(require('morgan')('dev')); + + var port = process.env.COPAY_PORT || 3001; var router = express.Router(); @@ -59,7 +62,6 @@ function returnError(err, res, req) { } var m = message || err.toString(); - console.log('[app.js.60]'); //TODO log.error('Error: ' + req.url + ' :' + code + ':' + m); res.status(code || 500).json({ error: m, diff --git a/bit-wallet/bit-send b/bit-wallet/bit-send index 2bf5665..7603bc5 100644 --- a/bit-wallet/bit-send +++ b/bit-wallet/bit-send @@ -19,15 +19,15 @@ if (!args[0] || !args[1] || !args[2]) var amount = args[1]; var message = args[2]; - var cli = new ClientLib({ -filename: program.config +var cli = new ClientLib({ + filename: program.config }); cli.send({toAddress: address, amount: amount, message:message}, function(err, x) { common.die(err); console.log(' * Tx created: ID %s [%s] RequiredSignatures:', - x.id, x.status, x.requiredSignatures); + x.id, x.status, x.requiredSignatures); if (program.verbose) - console.log('* Raw Server Response:\n', x); //TODO -}); + console.log('* Raw Server Response:\n', x); //TODO + }); diff --git a/bit-wallet/bit-sign b/bit-wallet/bit-sign new file mode 100644 index 0000000..679ea34 --- /dev/null +++ b/bit-wallet/bit-sign @@ -0,0 +1,33 @@ +#!/usr/bin/env node + +var program = require('commander'); +var ClientLib = require('../lib/clientlib.js'); +var common = require('./common'); + +program +.version('0.0.1') +.option('-c,--config [file]', 'Wallet config filename') +.option('-v,--verbose', 'be verbose') +.usage('[options]
') +.parse(process.argv); + +var args = program.args; +if (!args[0] || !args[1] || !args[2]) + program.help(); + + var address = args[0]; + var amount = args[1]; + var message = args[2]; + + var cli = new ClientLib({ +filename: program.config +}); + +cli.send({toAddress: address, amount: amount, message:message}, function(err, x) { + common.die(err); + console.log(' * Tx created: ID %s [%s] RequiredSignatures:', + x.id, x.status, x.requiredSignatures); + + if (program.verbose) + console.log('* Raw Server Response:\n', x); //TODO +}); diff --git a/bit-wallet/bit-status b/bit-wallet/bit-status index 8e2b163..ecad373 100644 --- a/bit-wallet/bit-status +++ b/bit-wallet/bit-status @@ -21,4 +21,12 @@ cli.status(function(err, x) { if (program.verbose) console.log('* Raw Server Response:\n', x); //TODO + + + cli.txProposals(function(err, x) { + console.log('[bit-status.27]', x); //TODO + + if (program.verbose) + console.log('* Raw Server Response:\n', x); //TODO + }); }); diff --git a/lib/clientlib.js b/lib/clientlib.js index 94885f7..cedc345 100644 --- a/lib/clientlib.js +++ b/lib/clientlib.js @@ -11,7 +11,7 @@ var fs = require('fs') var Bitcore = require('bitcore') var SignUtils = require('./signutils'); -var BASE_URL = 'http://localhost:3001/copay/api/'; +var BASE_URL = 'http://localhost:3001/copay/api'; function _createProposalOpts(opts, signingKey) { var msg = opts.toAddress + '|' + opts.amount + '|' + opts.message; diff --git a/package.json b/package.json index 3adba26..dd23bd5 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "npmlog": "^0.1.1", "preconditions": "^1.0.7", "request": "^2.53.0", + "morgan": "*", "uuid": "*" }, "devDependencies": {