mirror of https://github.com/BTCPrivate/copay.git
paypro: prepare for txp refactor. will stay reverted until #1001 is merged.
This commit is contained in:
parent
d87697dfed
commit
3ade672561
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
@ -1178,10 +1178,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);
|
||||
}
|
||||
|
||||
if (options.fetch) return;
|
||||
|
||||
|
@ -1193,15 +1191,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,
|
||||
|
@ -1210,9 +1209,7 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
|
|||
builder: b,
|
||||
comment: options.memo,
|
||||
merchant: merchantData
|
||||
};
|
||||
|
||||
var ntxid = this.txProposals.add(data);
|
||||
}));
|
||||
return ntxid;
|
||||
};
|
||||
|
||||
|
@ -1224,7 +1221,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.
|
||||
|
|
|
@ -782,7 +782,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]);
|
||||
|
@ -809,7 +809,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]);
|
||||
|
@ -830,12 +830,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]);
|
||||
|
@ -856,7 +856,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]);
|
||||
|
|
Loading…
Reference in New Issue