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

paypro: fix a lot of errors in payment protocol implementation.

This commit is contained in:
Christopher Jeffrey 2014-07-28 18:34:15 -07:00 committed by Manuel Araoz
parent b0dc3fc24d
commit b18c9e3cd5
1 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -789,14 +789,14 @@ Wallet.prototype.createPaymentTx = function(options, cb) {
data = PayPro.PaymentRequest.decode(data); data = PayPro.PaymentRequest.decode(data);
var pr = new PayPro(); var pr = new PayPro();
pr = pr.makePaymentRequest(data); pr = pr.makePaymentRequest(data);
return self.receivePaymentRequest(tx, options, pr, cb); return self.receivePaymentRequest(options, pr, cb);
}) })
.error(function(data, status, headers, config) { .error(function(data, status, headers, config) {
return cb(new Error('Status: ' + JSON.stringify(status))); return cb(new Error('Status: ' + JSON.stringify(status)));
}); });
}; };
Wallet.prototype.receivePaymentRequest = function(tx, options, pr, cb) { Wallet.prototype.receivePaymentRequest = function(options, pr, cb) {
var self = this; var self = this;
var ver = pr.get('payment_details_version'); var ver = pr.get('payment_details_version');
@ -808,15 +808,21 @@ Wallet.prototype.receivePaymentRequest = function(tx, options, pr, cb) {
var certs = PayPro.X509Certificates.decode(pki_data); var certs = PayPro.X509Certificates.decode(pki_data);
certs = certs.certificate; certs = certs.certificate;
// XXX Temporary fix for tests
if (!PayPro.RootCerts) {
PayPro.RootCerts = {
getTrusted: function() {}
};
}
var trusted = certs.map(function(cert) { var trusted = certs.map(function(cert) {
var der = cert.toString('hex'); var der = cert.toString('hex');
var pem = PayPro.prototype._DERtoPEM(der, 'CERTIFICATE'); var pem = PayPro.prototype._DERtoPEM(der, 'CERTIFICATE');
return RootCerts.getTrusted(pem); return PayPro.RootCerts.getTrusted(pem);
}); });
if (!trusted.length) { if (!trusted.length) {
var G = typeof window !== 'undefined' ? window : global; if (typeof SSL_UNTRUSTED === 'undefined') {
if (!G.SSL_UNTRUSTED) {
return cb(new Error('Not a trusted certificate.')); return cb(new Error('Not a trusted certificate.'));
} }
} }
@ -870,7 +876,7 @@ Wallet.prototype.receivePaymentRequest = function(tx, options, pr, cb) {
} }
}; };
return this.getUnspent(function(err, unpsent) { return this.getUnspent(function(err, unspent) {
var ntxid = self.createPaymentTxSync(options, merchantData, unspent); var ntxid = self.createPaymentTxSync(options, merchantData, unspent);
if (ntxid) { if (ntxid) {
self.sendIndexes(); self.sendIndexes();
@ -905,7 +911,7 @@ Wallet.prototype.sendPaymentTx = function(ntxid, options, cb) {
var refund_outputs = []; var refund_outputs = [];
options.refund_to = options.refund_to || self.getAddresses()[0]; options.refund_to = options.refund_to || self.getPubKeys()[0];
if (options.refund_to) { if (options.refund_to) {
var total = 0; var total = 0;
@ -997,14 +1003,12 @@ Wallet.prototype.receivePaymentRequestACK = function(tx, txp, ack, cb) {
Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent) { Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent) {
var self = this; var self = this;
var priv = this.privateKey;
var pkr = this.publicKeyRing;
var outs = []; // preconditions.checkArgument(new Address(toAddress).network().name === this.getNetworkName());
merchantData.pr.pd.outputs.forEach(function(output) { preconditions.checkState(pkr.isComplete());
outs.push({ if (options.memo) preconditions.checkArgument(options.memo.length <= 100);
address: self.getAddressesStr()[0], // dummy address
amount: 0 // dummy amount
});
});
var opts = { var opts = {
remainderOut: { remainderOut: {
@ -1012,16 +1016,25 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
} }
}; };
var outs = [];
merchantData.pr.pd.outputs.forEach(function(output) {
outs.push({
address: self.getAddressesStr()[0] || '1NGYre1pSqTnCXaqN5gLQ1e2KNTJXjDhtF', // dummy address
amountSatStr: '0' // dummy amount
});
});
var b = new Builder(opts) var b = new Builder(opts)
.setUnspent(unspent) .setUnspent(unspent)
.setOutputs(outs); .setOutputs(outs);
var priv = this.privateKey;
var pkr = this.publicKeyRing;
var selectedUtxos = b.getSelectedUnspent(); var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) { var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address); return pkr.pathForAddress(utxo.address);
}); });
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) { if (priv) {
var keys = priv.getForPaths(inputChainPaths); var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys); var signed = b.sign(keys);
@ -1034,7 +1047,11 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
var script = output.get var script = output.get
? output.get('script') ? output.get('script')
: new Buffer(output.script, 'hex'); : {
offset: output.script.offset,
limit: output.script.limit,
buffer: new Buffer(output.script.buffer, 'hex')
};
var v = new Buffer(8); var v = new Buffer(8);
v[0] = (amount.low >> 0) & 0xff; v[0] = (amount.low >> 0) & 0xff;
@ -1054,7 +1071,7 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
this.log(''); this.log('');
this.log('Created transaction:'); this.log('Created transaction:');
this.log(tx.getStandardizedObject()); this.log(b.tx.getStandardizedObject());
this.log(''); this.log('');
var myId = this.getMyCopayerId(); var myId = this.getMyCopayerId();