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

Merge pull request #544 from isocolsky/ref/txp-id 

Allow id to be specified for txps
This commit is contained in:
Matias Alejo Garcia 2016-07-26 11:15:29 -03:00 committed by GitHub
parent f791a7c7e4 b3578ccfb5
commit 0f3449a864
4 changed files with 173 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/errors/errordefinitions.js
View File

@ -23,6 +23,7 @@ var errors = {
NOT_AUTHORIZED: 'Not authorized',
TOO_MANY_KEYS: 'Too many keys registered',
TX_ALREADY_BROADCASTED: 'The transaction proposal is already broadcasted',
TX_ALREADY_EXISTS: 'A transaction proposal with the same id already exists',
TX_CANNOT_CREATE: 'Cannot create TX proposal during backoff time',
TX_CANNOT_REMOVE: 'Cannot remove this tx proposal during locktime',
TX_MAX_SIZE_EXCEEDED: 'TX exceeds maximum allowed size',

2
lib/model/txproposal.js
View File

@ -27,7 +27,7 @@ TxProposal.create = function(opts) {
var now = Date.now();
x.createdOn = Math.floor(now / 1000);
x.id = _.padLeft(now, 14, '0') + Uuid.v4();
x.id = opts.id || Uuid.v4();
x.walletId = opts.walletId;
x.creatorId = opts.creatorId;
x.message = opts.message;

148
lib/server.js
View File

@ -1934,6 +1934,7 @@ WalletService.prototype._validateAndSanitizeTxOpts = function(wallet, opts, cb)
/**
* Creates a new transaction proposal.
* @param {Object} opts
* @param {string} opts.txProposalId - Optional. If provided it will be used as this TX proposal ID. Should be unique in the scope of the wallet.
* @param {Array} opts.outputs - List of outputs.
* @param {string} opts.outputs[].toAddress - Destination address.
* @param {number} opts.outputs[].amount - Amount to transfer in satoshi.
@ -1973,73 +1974,90 @@ WalletService.prototype.createTx = function(opts, cb) {
}
};
function checkTxpAlreadyExists(txProposalId, cb) {
if (!txProposalId) return cb();
self.storage.fetchTx(self.walletId, txProposalId, function(err, txp) {
if (err || !txp) return cb(err);
if (txp.status == 'temporary') {
return cb(null, txp);
} else {
return cb(Errors.TX_ALREADY_EXISTS);
}
});
};
self._runLocked(cb, function(cb) {
var wallet, txp, changeAddress;
async.series([
function(next) {
self.getWallet({}, function(err, w) {
if (err) return next(err);
if (!w.isComplete()) return next(Errors.WALLET_NOT_COMPLETE);
wallet = w;
next();
});
},
function(next) {
self._validateAndSanitizeTxOpts(wallet, opts, next);
},
function(next) {
self._canCreateTx(function(err, canCreate) {
if (err) return next(err);
if (!canCreate) return next(Errors.TX_CANNOT_CREATE);
next();
});
},
function(next) {
if (opts.sendMax) return next();
getChangeAddress(wallet, function(err, address) {
if (err) return next(err);
changeAddress = address;
next();
});
},
function(next) {
var txOpts = {
walletId: self.walletId,
creatorId: self.copayerId,
outputs: opts.outputs,
message: opts.message,
changeAddress: changeAddress,
feePerKb: opts.feePerKb,
payProUrl: opts.payProUrl,
walletM: wallet.m,
walletN: wallet.n,
excludeUnconfirmedUtxos: !!opts.excludeUnconfirmedUtxos,
validateOutputs: !opts.validateOutputs,
addressType: wallet.addressType,
customData: opts.customData,
inputs: opts.inputs,
fee: opts.inputs && !_.isNumber(opts.feePerKb) ? opts.fee : null,
noShuffleOutputs: opts.noShuffleOutputs
};
txp = Model.TxProposal.create(txOpts);
next();
},
function(next) {
self._selectTxInputs(txp, opts.utxosToExclude, next);
},
function(next) {
if (!changeAddress || opts.dryRun) return next();
self.storage.storeAddressAndWallet(wallet, txp.changeAddress, next);
},
function(next) {
if (opts.dryRun) return next();
self.storage.storeTx(wallet.id, txp, next);
},
], function(err) {
var txp, changeAddress;
self.getWallet({}, function(err, wallet) {
if (err) return cb(err);
return cb(null, txp);
if (!wallet.isComplete()) return cb(Errors.WALLET_NOT_COMPLETE);
checkTxpAlreadyExists(opts.txProposalId, function(err, txp) {
if (err) return cb(err);
if (txp) return cb(null, txp);
async.series([
function(next) {
self._validateAndSanitizeTxOpts(wallet, opts, next);
},
function(next) {
self._canCreateTx(function(err, canCreate) {
if (err) return next(err);
if (!canCreate) return next(Errors.TX_CANNOT_CREATE);
next();
});
},
function(next) {
if (opts.sendMax) return next();
getChangeAddress(wallet, function(err, address) {
if (err) return next(err);
changeAddress = address;
next();
});
},
function(next) {
var txOpts = {
id: opts.txProposalId,
walletId: self.walletId,
creatorId: self.copayerId,
outputs: opts.outputs,
message: opts.message,
changeAddress: changeAddress,
feePerKb: opts.feePerKb,
payProUrl: opts.payProUrl,
walletM: wallet.m,
walletN: wallet.n,
excludeUnconfirmedUtxos: !!opts.excludeUnconfirmedUtxos,
validateOutputs: !opts.validateOutputs,
addressType: wallet.addressType,
customData: opts.customData,
inputs: opts.inputs,
fee: opts.inputs && !_.isNumber(opts.feePerKb) ? opts.fee : null,
noShuffleOutputs: opts.noShuffleOutputs
};
txp = Model.TxProposal.create(txOpts);
next();
},
function(next) {
self._selectTxInputs(txp, opts.utxosToExclude, next);
},
function(next) {
if (!changeAddress || opts.dryRun) return next();
self.storage.storeAddressAndWallet(wallet, txp.changeAddress, next);
},
function(next) {
if (opts.dryRun) return next();
self.storage.storeTx(wallet.id, txp, next);
},
], function(err) {
if (err) return cb(err);
return cb(null, txp);
});
});
});
});
};

88
test/integration/server.js
View File

@ -2982,6 +2982,94 @@ describe('Wallet service', function() {
});
});
});
it('should create a tx with foreign ID', function(done) {
helpers.stubUtxos(server, wallet, 2, function() {
var txOpts = {
txProposalId: '123',
outputs: [{
toAddress: '18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7',
amount: 1e8,
}],
feePerKb: 100e2,
};
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
tx.id.should.equal('123');
done();
});
});
});
it('should return already created tx if same foreign ID is specified and tx still unpublished', function(done) {
helpers.stubUtxos(server, wallet, 2, function() {
var txOpts = {
txProposalId: '123',
outputs: [{
toAddress: '18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7',
amount: 1e8,
}],
feePerKb: 100e2,
};
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
tx.id.should.equal('123');
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
tx.id.should.equal('123');
server.storage.fetchTxs(wallet.id, {}, function(err, txs) {
should.not.exist(err);
should.exist(txs);
txs.length.should.equal(1);
done();
});
});
});
});
});
it('should fail to create tx if same foreign ID is specified and tx already published', function(done) {
helpers.stubUtxos(server, wallet, [2, 2, 2], function() {
var txOpts = {
txProposalId: '123',
outputs: [{
toAddress: '18PzpUFkFZE8zKWUPvfykkTxmB9oMR8qP7',
amount: 1e8,
}],
feePerKb: 100e2,
};
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
tx.id.should.equal('123');
var publishOpts = helpers.getProposalSignatureOpts(tx, TestData.copayers[0].privKey_1H_0);
server.publishTx(publishOpts, function(err) {
should.not.exist(err);
server.createTx(txOpts, function(err, tx) {
should.exist(err);
should.not.exist(tx);
err.code.should.equal('TX_ALREADY_EXISTS');
server.storage.fetchTxs(wallet.id, {}, function(err, txs) {
should.not.exist(err);
should.exist(txs);
txs.length.should.equal(1);
txOpts.txProposalId = null;
server.createTx(txOpts, function(err, tx) {
should.not.exist(err);
should.exist(tx);
tx.id.should.not.equal('123');
server.storage.fetchTxs(wallet.id, {}, function(err, txs) {
should.not.exist(err);
txs.length.should.equal(2);
done();
});
});
});
});
});
});
});
});
it('should be able to publish a temporary tx proposal', function(done) {
helpers.stubUtxos(server, wallet, [1, 2], function() {
var txOpts = {