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

txp* test passing

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-08-03 22:34:47 -03:00
commit 753b890658
5 changed files with 417 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

27
js/models/core/TxProposals.js
View file

@ -56,21 +56,30 @@ TxProposals.prototype.toObj = function() {
};
TxProposals.prototype.merge = function(inTxp, allowedPubKeys) {
var myTxps = this.txps;
TxProposals.prototype.merge = function(inObj, senderId, copayersForPubkeys, builderOpts) {
var safeObj = inObj.trimUntrustedObj();
var incomingTx = TxProposal.fromObj(safeObj, builderOpts);
incomingTx._sync();
var myTxps = this.txps;
var ntxid = inTxp.getId();
var ret = {};
var ret = {
ntxid: ntxid
};
if (myTxps[ntxid]) {
var v0 = myTxps[ntxid];
var v1 = inTxp;
ret = v0.merge(v1, allowedPubKeys);
}
else {
this.txps[ntxid] = inTxp;
// Merge an existing txProposal
ret.hasChanged = myTxps[ntxid].merge(inTxp, allowedPubKeys);
} else {
// Create a new one
ret.new = 1;
this.txps[ntxid] = inTxp;
}
ret.txp = this.txps[ntxid];
return ret;
};