anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

paypro: reorganize createPaymentTxSync.

Browse source
This commit is contained in:
Christopher Jeffrey 2014-08-05 16:14:50 -07:00 • committed by Manuel Araoz
commit 18d1e4f6e7
2 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

24
js/models/core/Wallet.js
View file

@ -1133,18 +1133,6 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
.setUnspent(unspent) .setUnspent(unspent)
.setOutputs(outs); .setOutputs(outs);
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
merchantData.total = bignum(merchantData.total, 10); merchantData.total = bignum(merchantData.total, 10);
merchantData.pr.pd.outputs.forEach(function(output, i) { merchantData.pr.pd.outputs.forEach(function(output, i) {
@ -1178,6 +1166,18 @@ Wallet.prototype.createPaymentTxSync = function(options, merchantData, unspent)
merchantData.total = merchantData.total.toString(10); merchantData.total = merchantData.total.toString(10);
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
if (options.fetch) return; if (options.fetch) return;
this.log(''); this.log('');

48
test/test.PayPro.js
View file

@ -246,18 +246,6 @@ describe('PayPro (in Wallet) model', function() {
.setUnspent(unspentTest) .setUnspent(unspentTest)
.setOutputs(outs); .setOutputs(outs);
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
outputs.forEach(function(output, i) { outputs.forEach(function(output, i) {
var amount = output.get('amount'); var amount = output.get('amount');
var script = { var script = {
@ -282,6 +270,18 @@ describe('PayPro (in Wallet) model', function() {
b.tx.outs[i].s = s; b.tx.outs[i].s = s;
}); });
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
var tx = b.build(); var tx = b.build();
var refund_outputs = []; var refund_outputs = [];
@ -472,18 +472,6 @@ describe('PayPro (in Wallet) model', function() {
.setUnspent(unspentTest) .setUnspent(unspentTest)
.setOutputs(outs); .setOutputs(outs);
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
outputs.forEach(function(output, i) { outputs.forEach(function(output, i) {
var amount = output.get('amount'); var amount = output.get('amount');
var script = { var script = {
@ -508,6 +496,18 @@ describe('PayPro (in Wallet) model', function() {
b.tx.outs[i].s = s; b.tx.outs[i].s = s;
}); });
var selectedUtxos = b.getSelectedUnspent();
var inputChainPaths = selectedUtxos.map(function(utxo) {
return pkr.pathForAddress(utxo.address);
});
b = b.setHashToScriptMap(pkr.getRedeemScriptMap(inputChainPaths));
if (priv) {
var keys = priv.getForPaths(inputChainPaths);
var signed = b.sign(keys);
}
var tx = b.build(); var tx = b.build();
var refund_outputs = []; var refund_outputs = [];