Browse Source

update json

activeAddress
Matias Alejo Garcia 10 years ago
parent
commit
e8dce5adfd
  1. 8
      lib/client/api.js
  2. 14
      package.json
  3. 2
      test/integration/clientApi.js

8
lib/client/api.js

@ -430,6 +430,11 @@ API.prototype.import = function(str, cb) {
});
};
/**
*
* opts.doNotVerify
* @return {undefined}
*/
API.prototype.getTxProposals = function(opts, cb) {
var self = this;
@ -444,7 +449,8 @@ API.prototype.getTxProposals = function(opts, cb) {
_.each(txps, function(txp) {
txp.decryptedMessage = _decryptProposalMessage(txp.message, data.sharedEncryptingKey);
if (!Verifier.checkTxProposal(data, txp))
if (!opts.doNotVerify
&& !Verifier.checkTxProposal(data, txp))
fake = true;
});

14
package.json

@ -1,7 +1,7 @@
{
"name": "copay-server",
"description": "Copay server",
"author": "isocolsky",
"name": "bitcore-wallet-service",
"description": "A service for Mutisig HD Bitcoin Wallets",
"author": "BitPay Inc",
"version": "0.0.1",
"keywords": [
"bitcoin",
@ -10,11 +10,11 @@
"wallet"
],
"repository": {
"url": "git@github.com:isocolsky/copay-lib.git",
"url": "git@github.com:bitpay/bitcore-wallet-service.git",
"type": "git"
},
"bugs": {
"url": "https://github.com/isocolsky/copay-lib/issues"
"url": "https://github.com/bitpay/bitcore-wallet-service/issues"
},
"dependencies": {
"async": "^0.9.0",
@ -45,6 +45,8 @@
"istanbul": "*"
},
"scripts": {
"start": "node server.js"
"start": "node server.js",
"coverage": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha -- --reporter spec test",
"test": "./node_modules/.bin/mocha"
}
}

2
test/integration/clientApi.js

@ -414,7 +414,7 @@ describe('client API ', function() {
});
describe('Transaction Troposals Creation and Locked funds', function() {
describe('Transaction Proposals Creation and Locked funds', function() {
it('Should lock and release funds', function(done) {
helpers.createAndJoinWallet(clients, 2, 2, function(err, w) {
clients[0].createAddress(function(err, x0) {

Loading…
Cancel
Save