From 7c1860117e0c0575575b07823a2c2509d0a24b86 Mon Sep 17 00:00:00 2001 From: Matias Alejo Garcia Date: Sun, 15 Feb 2015 19:06:11 -0300 Subject: [PATCH] sign/reject with args (if only one txp) --- bit-wallet/bit-broadcast | 32 ++++++++++++++++---------------- bit-wallet/bit-reject | 4 +--- bit-wallet/bit-sign | 5 +---- lib/model/txproposal.js | 2 +- lib/server.js | 3 ++- 5 files changed, 21 insertions(+), 25 deletions(-) mode change 100644 => 100755 bit-wallet/bit-broadcast diff --git a/bit-wallet/bit-broadcast b/bit-wallet/bit-broadcast old mode 100644 new mode 100755 index 24597fa..82fa266 --- a/bit-wallet/bit-broadcast +++ b/bit-wallet/bit-broadcast @@ -3,28 +3,28 @@ var _ = require('lodash'); var program = require('commander'); var Client = require('../lib/client'); -var utils = require('./cli-utils'); +var utils = require('./cli-utils'); program -.version('0.0.1') -.option('-c,--config [file]', 'Wallet config filename') -.option('-v,--verbose', 'be verbose') -.usage('[options] ') -.parse(process.argv); + .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]) program.help(); - var txpid = args[0]; - var client = utils.getClient(program); +var txpid = args[0]; +var client = utils.getClient(program); - client.getTxProposals({}, function(err, txps) { - utils.die(err); +client.getTxProposals({}, function(err, txps) { + utils.die(err); - var txp = utils.findOneTxProposal(txps, txpid); - client.broadcastTxProposal(txp, function(err, txid) { - utils.die(err); - console.log('TX Broadcasted: ',txid); - }); - }); + var txp = utils.findOneTxProposal(txps, txpid); + client.broadcastTxProposal(txp, function(err, txid) { + utils.die(err); + console.log('TX Broadcasted: ', txid); + }); +}); diff --git a/bit-wallet/bit-reject b/bit-wallet/bit-reject index 3389a6b..fcaf663 100644 --- a/bit-wallet/bit-reject +++ b/bit-wallet/bit-reject @@ -13,9 +13,7 @@ program .parse(process.argv); var args = program.args; -if (!args[0]) - program.help(); -var txpid = args[0]; +var txpid = args[0] || ''; var reason = args[1] || ''; var client = utils.getClient(program); diff --git a/bit-wallet/bit-sign b/bit-wallet/bit-sign index 845c671..4c41f48 100755 --- a/bit-wallet/bit-sign +++ b/bit-wallet/bit-sign @@ -12,10 +12,7 @@ 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) { diff --git a/lib/model/txproposal.js b/lib/model/txproposal.js index 7fc7347..6035cd0 100644 --- a/lib/model/txproposal.js +++ b/lib/model/txproposal.js @@ -105,7 +105,7 @@ TxProposal.prototype._getBitcoreTx = function() { }; TxProposal.prototype.getNetworkName = function() { - return Bitcore.Address(this.toAddress).toObject().networkName; + return Bitcore.Address(this.toAddress).toObject().network; }; TxProposal.prototype.getRawTx = function() { diff --git a/lib/server.js b/lib/server.js index 7923351..f5a0362 100644 --- a/lib/server.js +++ b/lib/server.js @@ -317,6 +317,7 @@ CopayServer.prototype._getBlockExplorer = function(provider, network) { url = 'https://test-insight.bitpay.com:443' break; } +console.log('[server.js.320:url:]',url); //TODO return new Explorers.Insight(url, network); break; } @@ -698,7 +699,7 @@ CopayServer.prototype.broadcastTx = function(opts, cb) { txid: txid }); - return cb(null, txp); + return cb(null, txid); }); }); });