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

rm pending Tx

activeAddress
Matias Alejo Garcia 10 years ago
parent
324c058303
commit
f8702ebcce
3 changed files with 128 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      lib/server.js
  2. 5
      lib/storage.js
  3. 129
      test/integration.js

14
lib/server.js
View File

@ -1,5 +1,4 @@
'use strict';
var _ = require('lodash');
var $ = require('preconditions').singleton();
var async = require('async');
@ -505,12 +504,19 @@ CopayServer.prototype.removePendingTx = function(opts, cb) {
if (!txp.isPending())
return cb(new ClientError('Transaction proposal not pending'));
if (txp.creatorId !== self.copayerId)
return cb(new ClientError('Not allowed to erase this TX'));
var actors = txp.getActors();
if (actors.length > 1 || actors[0] !== self.copayerId)
return cb(new ClientError('No allowed to erase this TX'));
if (actors.length > 1)
return cb(new ClientError('Not allowed to erase this TX'));
if (actors.length == 1 && actors[0] !== self.copayerId)
return cb(new ClientError('Not allowed to erase this TX'));
self.storage.removeTx(opts.id, cb);
self.storage.removeTx(self.walletId, opts.id, cb);
});
});
};

5
lib/storage.js
View File

@ -190,11 +190,10 @@ Storage.prototype.storeTx = function(walletId, txp, cb) {
Storage.prototype.removeTx = function(walletId, txProposalId, cb) {
var ops = [{
type: 'del',
key: KEY.TXP(walletId, txp.id),
key: KEY.TXP(walletId, txProposalId),
}, {
type: 'del',
key: KEY.PENDING_TXP(walletId, txp.id),
value: txp,
key: KEY.PENDING_TXP(walletId, txProposalId),
}];
this.db.batch(ops, cb);

129
test/integration.js
View File

@ -130,11 +130,11 @@ helpers.stubBlockExplorer = function(server, utxos, txid) {
helpers.clientSign = function(tx, xpriv, n) {
helpers.clientSign = function(tx, xprivHex) {
//Derive proper key to sign, for each input
var privs = [],
derived = {};
var xpriv = new Bitcore.HDPrivateKey(TestData.copayers[0].xPrivKey);
var xpriv = new Bitcore.HDPrivateKey(xprivHex);
_.each(tx.inputs, function(i) {
if (!derived[i.path]) {
@ -146,7 +146,7 @@ helpers.clientSign = function(tx, xpriv, n) {
var t = new Bitcore.Transaction();
_.each(tx.inputs, function(i) {
t.from(i, i.publicKeys, n);
t.from(i, i.publicKeys, tx.requiredSignatures);
});
t.to(tx.toAddress, tx.amount)
@ -435,7 +435,7 @@ describe('Copay server', function() {
describe('#verifyMessageSignature', function() {
var server, wallet;
beforeEach(function(done) {
helpers.createAndJoinWallet(2, 2, function(s, w) {
helpers.createAndJoinWallet(2, 3, function(s, w) {
server = s;
wallet = w;
done();
@ -559,7 +559,7 @@ describe('Copay server', function() {
describe('#createTx', function() {
var server, wallet, copayerPriv;
beforeEach(function(done) {
helpers.createAndJoinWallet(2, 2, function(s, w, c) {
helpers.createAndJoinWallet(2, 3, function(s, w, c) {
server = s;
wallet = w;
copayerPriv = c;
@ -770,7 +770,7 @@ describe('Copay server', function() {
var server, wallet, copayerPriv, txid, copayerIds;
beforeEach(function(done) {
helpers.createAndJoinWallet(2, 2, function(s, w, c, ids) {
helpers.createAndJoinWallet(2, 3, function(s, w, c, ids) {
server = s;
wallet = w;
copayerPriv = c;
@ -820,7 +820,7 @@ describe('Copay server', function() {
var server, wallet, copayerPriv, txid, copayerIds;
beforeEach(function(done) {
helpers.createAndJoinWallet(2, 2, function(s, w, c, ids) {
helpers.createAndJoinWallet(2, 3, function(s, w, c, ids) {
server = s;
wallet = w;
copayerPriv = c;
@ -845,7 +845,7 @@ describe('Copay server', function() {
var tx = txs[0];
tx.id.should.equal(txid);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txid,
signatures: signatures,
@ -867,12 +867,28 @@ describe('Copay server', function() {
});
});
it('should fail to sign with a xpriv from other copayer', function(done) {
server.getPendingTxs({}, function(err, txs) {
var tx = txs[0];
tx.id.should.equal(txid);
var signatures = helpers.clientSign(tx, TestData.copayers[1].xPrivKey);
server.signTx({
txProposalId: txid,
signatures: signatures,
}, function(err) {
err.code.should.contain('BADSIG');
done();
});
});
});
it('should fail if one signature is broken', function(done) {
server.getPendingTxs({}, function(err, txs) {
var tx = txs[0];
tx.id.should.equal(txid);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey);
signatures[0] = 1;
server.signTx({
@ -884,6 +900,7 @@ describe('Copay server', function() {
});
});
});
it('should fail on invalid signature', function(done) {
server.getPendingTxs({}, function(err, txs) {
var tx = txs[0];
@ -905,7 +922,7 @@ describe('Copay server', function() {
var tx = txs[0];
tx.id.should.equal(txid);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txid,
signatures: signatures,
@ -928,7 +945,7 @@ describe('Copay server', function() {
server.rejectTx({
txProposalId: txid,
}, function(err) {
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(tx, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txid,
signatures: signatures,
@ -970,7 +987,7 @@ describe('Copay server', function() {
server.getPendingTxs({}, function(err, txps) {
var txp = txps[0];
txp.id.should.equal(txpid);
var signatures = helpers.clientSign(txp, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(txp, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txpid,
signatures: signatures,
@ -996,7 +1013,7 @@ describe('Copay server', function() {
server.getPendingTxs({}, function(err, txps) {
var txp = txps[0];
txp.id.should.equal(txpid);
var signatures = helpers.clientSign(txp, TestData.copayers[0].xPrivKey, wallet.n);
var signatures = helpers.clientSign(txp, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txpid,
signatures: signatures,
@ -1234,4 +1251,90 @@ describe('Copay server', function() {
}, cat);
});
});
describe('#removePendingTx', function() {
var server, wallet, copayerPriv, txp;
beforeEach(function(done) {
helpers.createAndJoinWallet(2, 3, function(s, w, c) {
server = s;
wallet = w;
copayerPriv = c;
server.createAddress({}, function(err, address) {
helpers.createUtxos(server, wallet, helpers.toSatoshi([100, 200]), function(utxos) {
helpers.stubBlockExplorer(server, utxos);
var txOpts = helpers.createProposalOpts('18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7', 80, 'some message', copayerPriv[0].privKey);
server.createTx(txOpts, function(err, tx) {
server.getPendingTxs({}, function(err, txs) {
txp = txs[0];
done();
});
});
});
});
});
});
it('should allow creator to remove an unsigned TX', function(done) {
server.removePendingTx({
id: txp.id
}, function(err) {
should.not.exist(err);
server.getPendingTxs({}, function(err, txs) {
txs.length.should.equal(0);
done();
});
});
});
it('should allow creator to remove an signed TX by himself', function(done) {
var signatures = helpers.clientSign(txp, TestData.copayers[0].xPrivKey);
server.signTx({
txProposalId: txp[0],
signatures: signatures,
}, function(err) {
server.removePendingTx({
id: txp.id
}, function(err) {
should.not.exist(err);
server.getPendingTxs({}, function(err, txs) {
txs.length.should.equal(0);
done();
});
});
});
});
it('should not allow non-creator copayer to remove an unsigned TX ', function(done) {
helpers.getAuthServer(wallet.copayers[1].id, function(server2) {
server2.removePendingTx({
id: txp.id
}, function(err) {
err.message.should.contain('Not allowed');
server2.getPendingTxs({}, function(err, txs) {
txs.length.should.equal(1);
done();
});
});
});
});
it('should not allow creator copayer to remove an TX signed by other copayer', function(done) {
helpers.getAuthServer(wallet.copayers[1].id, function(server2) {
var signatures = helpers.clientSign(txp, TestData.copayers[1].xPrivKey);
server2.signTx({
txProposalId: txp.id,
signatures: signatures,
}, function(err) {
should.not.exist(err);
server.removePendingTx({
id: txp.id
}, function(err) {
err.message.should.contain('Not allowed');
done();
});
});
});
});
});
});

Write Preview
Loading…
Cancel
Save