BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Revert "paypro: prepare for txp refactor. will stay reverted until #1001 is merged."" 

This reverts commit 6fcd27b3ea0f7aa1ef7985560ca917393510c65e.
This commit is contained in:
Christopher Jeffrey 2014-08-06 17:17:01 -07:00 committed by Manuel Araoz
parent 1035adffab
commit 17f3402dab
3 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/controllers/send.js
View File

@ -63,7 +63,7 @@ angular.module('copayApp.controllers').controller('SendController',
function done(ntxid, merchantData) {
if (merchantData && +merchantData.total === 0) {
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
txp.builder.tx.outs[0].v = bitcore.Bignum(amount + '', 10).toBuffer({
endian: 'little',
size: 1

23
js/models/core/Wallet.js
View File

@ -965,7 +965,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
options = {};
}
var txp = this.txProposals.txps[ntxid];
var txp = this.txProposals.get(ntxid);
if (!txp) return;
var tx = txp.builder.build();
@ -1190,10 +1190,8 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
if (options.fetch) return;
@ -1205,15 +1203,16 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
var myId = this.getMyCopayerId();
var now = Date.now();
var me = {};
var tx = b.build();
if (priv && tx.countInputSignatures(0)) me[myId] = now;
if (!tx.countInputSignatures(0))
throw new Error('Could not sign generated tx');
var me = {};
me[myId] = now;
var meSeen = {};
if (priv) meSeen[myId] = now;
var data = {
var ntxid = this.txProposals.add(new TxProposal({
inputChainPaths: inputChainPaths,
signedBy: me,
seenBy: meSeen,
@ -1222,9 +1221,7 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
builder: b,
comment: options.memo,
merchant: merchantData
};
var ntxid = this.txProposals.add(data);
}));
return ntxid;
};
@ -1236,7 +1233,7 @@ Wallet.prototype.verifyPaymentRequest = function(ntxid) {
if (!ntxid) return false;
var txp = typeof ntxid !== 'object'
? this.txProposals.txps[ntxid]
? this.txProposals.get(ntxid)
: ntxid;
// If we're not a payment protocol proposal, ignore.

10
test/test.PayPro.js
View File

@ -869,7 +869,7 @@ describe('PayPro (in Wallet) model', function() {
merchantData.raw = pr.serialize().toString('hex');
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -896,7 +896,7 @@ describe('PayPro (in Wallet) model', function() {
amount.low = 2;
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -917,12 +917,12 @@ describe('PayPro (in Wallet) model', function() {
should.exist(merchantData);
// Tamper with payment request in its abstract form:
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
var tx = txp.builder.tx || txp.builder.build();
tx.outs[0].v = new Buffer([2, 0, 0, 0, 0, 0, 0, 0]);
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);
@ -943,7 +943,7 @@ describe('PayPro (in Wallet) model', function() {
should.exist(merchantData);
var myId = w.getMyCopayerId();
var txp = w.txProposals.txps[ntxid];
var txp = w.txProposals.get(ntxid);
should.exist(txp);
should.exist(txp.signedBy[myId]);
should.not.exist(txp.rejectedBy[myId]);