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

update json

This commit is contained in:
Matias Alejo Garcia 2015-02-20 12:25:21 -03:00
parent e6c53e6cb2
commit e8dce5adfd
3 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/client/api.js
View File

@ -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;
});

98
package.json
View File

@ -1,50 +1,52 @@
{
"name": "copay-server",
"description": "Copay server",
"author": "isocolsky",
"version": "0.0.1",
"keywords": [
"bitcoin",
"copay",
"multisig",
"wallet"
],
"repository": {
"url": "git@github.com:isocolsky/copay-lib.git",
"type": "git"
},
"bugs": {
"url": "https://github.com/isocolsky/copay-lib/issues"
},
"dependencies": {
"async": "^0.9.0",
"bitcore": "git+https://github.com/eordano/bitcore.git#7e88167891811163071ae35dc3dbb705ab6ccff8",
"bitcore-explorers": "^0.9.1",
"body-parser": "^1.11.0",
"commander": "^2.6.0",
"express": "^4.10.0",
"inherits": "^2.0.1",
"leveldown": "^0.10.0",
"levelup": "^0.19.0",
"lodash": "^3.2.0",
"morgan": "*",
"npmlog": "^0.1.1",
"preconditions": "^1.0.7",
"qr-image": "*",
"request": "^2.53.0",
"sjcl": "^1.0.2",
"uuid": "*"
},
"devDependencies": {
"chai": "^1.9.1",
"mocha": "^1.18.2",
"sinon": "^1.10.3",
"memdown": "^1.0.0",
"jsdoc": "^3.3.0",
"supertest": "*",
"istanbul": "*"
},
"scripts": {
"start": "node server.js"
}
"name": "bitcore-wallet-service",
"description": "A service for Mutisig HD Bitcoin Wallets",
"author": "BitPay Inc",
"version": "0.0.1",
"keywords": [
"bitcoin",
"copay",
"multisig",
"wallet"
],
"repository": {
"url": "git@github.com:bitpay/bitcore-wallet-service.git",
"type": "git"
},
"bugs": {
"url": "https://github.com/bitpay/bitcore-wallet-service/issues"
},
"dependencies": {
"async": "^0.9.0",
"bitcore": "git+https://github.com/eordano/bitcore.git#7e88167891811163071ae35dc3dbb705ab6ccff8",
"bitcore-explorers": "^0.9.1",
"body-parser": "^1.11.0",
"commander": "^2.6.0",
"express": "^4.10.0",
"inherits": "^2.0.1",
"leveldown": "^0.10.0",
"levelup": "^0.19.0",
"lodash": "^3.2.0",
"morgan": "*",
"npmlog": "^0.1.1",
"preconditions": "^1.0.7",
"qr-image": "*",
"request": "^2.53.0",
"sjcl": "^1.0.2",
"uuid": "*"
},
"devDependencies": {
"chai": "^1.9.1",
"mocha": "^1.18.2",
"sinon": "^1.10.3",
"memdown": "^1.0.0",
"jsdoc": "^3.3.0",
"supertest": "*",
"istanbul": "*"
},
"scripts": {
"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
View File

@ -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) {