diff --git a/README.md b/README.md index e138109..a0a2b42 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ A Multisig HD Wallet Service, with minimun server trust. ./bit -c pete.dat status export BIT_FILE=pete.dat + export BIT_HOST=http://pepe.com/bws ./bit address [1bitcoinaddress] ./bit balance diff --git a/bit-wallet/bit b/bit-wallet/bit index 30febfe..40b36d9 100755 --- a/bit-wallet/bit +++ b/bit-wallet/bit @@ -17,6 +17,7 @@ program .command('rm ', 'remove a transaction proposal') .command('export', 'export wallet critical data') .command('import', 'import wallet critical data') + .command('confirm', 'show copayer\'s data for confirmation') .parse(process.argv); diff --git a/bit-wallet/bit-address b/bit-wallet/bit-address index 2cff9c3..96c935f 100755 --- a/bit-wallet/bit-address +++ b/bit-wallet/bit-address @@ -7,6 +7,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .parse(process.argv); diff --git a/bit-wallet/bit-addresses b/bit-wallet/bit-addresses index a415c22..9dee996 100755 --- a/bit-wallet/bit-addresses +++ b/bit-wallet/bit-addresses @@ -8,6 +8,7 @@ var Client = require('../lib/client'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .parse(process.argv); diff --git a/bit-wallet/bit-balance b/bit-wallet/bit-balance index 790598e..8138188 100755 --- a/bit-wallet/bit-balance +++ b/bit-wallet/bit-balance @@ -7,6 +7,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .parse(process.argv); diff --git a/bit-wallet/bit-broadcast b/bit-wallet/bit-broadcast index e97c6e2..44ec197 100755 --- a/bit-wallet/bit-broadcast +++ b/bit-wallet/bit-broadcast @@ -8,6 +8,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c,--config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v,--verbose', 'be verbose') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-create b/bit-wallet/bit-create index dae6ad6..2f267ca 100755 --- a/bit-wallet/bit-create +++ b/bit-wallet/bit-create @@ -8,6 +8,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-t, --testnet', 'Create a Testnet Wallet', String) .usage('[options] [copayerName]') .parse(process.argv); diff --git a/bit-wallet/bit-export b/bit-wallet/bit-export index a4604b3..a9c3a46 100755 --- a/bit-wallet/bit-export +++ b/bit-wallet/bit-export @@ -9,6 +9,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .option('-q, --qr') .parse(process.argv); diff --git a/bit-wallet/bit-join b/bit-wallet/bit-join index bbfb314..dc0d974 100755 --- a/bit-wallet/bit-join +++ b/bit-wallet/bit-join @@ -7,6 +7,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] [copayerName]') .parse(process.argv); diff --git a/bit-wallet/bit-reject b/bit-wallet/bit-reject index 3a7ac6a..bfd4f13 100755 --- a/bit-wallet/bit-reject +++ b/bit-wallet/bit-reject @@ -9,6 +9,7 @@ program .version('0.0.1') .option('-c,--config [file]', 'Wallet config filename') .option('-v,--verbose', 'be verbose') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] [reason]') .parse(process.argv); diff --git a/bit-wallet/bit-rm b/bit-wallet/bit-rm index 45902eb..f56356a 100755 --- a/bit-wallet/bit-rm +++ b/bit-wallet/bit-rm @@ -9,6 +9,7 @@ program .version('0.0.1') .option('-c,--config [file]', 'Wallet config filename') .option('-v,--verbose', 'be verbose') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-send b/bit-wallet/bit-send index 898600e..c83f528 100755 --- a/bit-wallet/bit-send +++ b/bit-wallet/bit-send @@ -7,6 +7,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .usage('[options]
') .parse(process.argv); diff --git a/bit-wallet/bit-sign b/bit-wallet/bit-sign index 7c54dd9..17c0a74 100755 --- a/bit-wallet/bit-sign +++ b/bit-wallet/bit-sign @@ -8,6 +8,7 @@ program .version('0.0.1') .option('-c,--config [file]', 'Wallet config filename') .option('-v,--verbose', 'be verbose') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .usage('[options] ') .parse(process.argv); diff --git a/bit-wallet/bit-status b/bit-wallet/bit-status index 32fa992..2bb188a 100755 --- a/bit-wallet/bit-status +++ b/bit-wallet/bit-status @@ -7,6 +7,7 @@ var utils = require('./cli-utils'); program .version('0.0.1') .option('-c, --config [file]', 'Wallet config filename') + .option('-h, --host [host]', 'Bitcore Wallet Service URL (eg: http://localhost:3001/copay/api') .option('-v, --verbose', 'be verbose') .parse(process.argv); diff --git a/bit-wallet/cli-utils.js b/bit-wallet/cli-utils.js index 5bab010..fdb25df 100644 --- a/bit-wallet/cli-utils.js +++ b/bit-wallet/cli-utils.js @@ -37,6 +37,7 @@ Utils.getClient = function(args) { }); return new Client({ storage: storage, + baseUrl: args.host || process.env['BIT_HOST'], verbose: args.verbose }); } diff --git a/lib/client/api.js b/lib/client/api.js index caafc49..d5ab890 100644 --- a/lib/client/api.js +++ b/lib/client/api.js @@ -23,10 +23,6 @@ function _createProposalOpts(opts, signingKey) { return opts; }; -function _getUrl(path) { - return BASE_URL + path; -}; - function _parseError(body) { if (_.isString(body)) { try { @@ -58,6 +54,7 @@ function API(opts) { this.storage = opts.storage; this.verbose = !!opts.verbose; this.request = request || opts.request; + this.baseUrl = opts.baseUrl || BASE_URL; if (this.verbose) { log.level = 'debug'; } @@ -112,7 +109,7 @@ API.prototype._doRequest = function(method, url, args, data, cb) { if (data.signingPrivKey) reqSignature = _signRequest(method, url, args, data.signingPrivKey); - var absUrl = _getUrl(url); + var absUrl = this.baseUrl + url; var args = { headers: { 'x-identity': data.copayerId,