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

add FORCED options to TxBuilder creation

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-07-25 17:45:56 -03:00
commit 3aef6e156b
3 changed files with 87 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,8 +25,7 @@ function TxProposal(opts) {
}
TxProposal.prototype.getID = function() {
var ntxid = this.builder.build().getNormalizedHash().toString('hex');
return ntxid;
return this.builder.build().getNormalizedHash().toString('hex');
};
TxProposal.prototype.toObj = function() {
@ -42,16 +41,24 @@ TxProposal.prototype.setSent = function(sentTxid) {
this.sentTs = Date.now();
};
TxProposal.fromObj = function(o) {
TxProposal.fromObj = function(o, forceOpts) {
var t = new TxProposal(o);
// force opts is requested.
for (var k in forceOpts) {
o.builderObj.opts[k] = forceOpts[k];
}
try {
t.builder = new TransactionBuilder.fromObj(o.builderObj);
t.builder = TransactionBuilder.fromObj(o.builderObj);
} catch (e) {
if (!o.version) {
t.builder = new BuilderMockV0(o.builderObj);
t.readonly = 1;
};
}
return t;
};
@ -172,15 +179,16 @@ function TxProposals(opts) {
this.txps = {};
}
TxProposals.fromObj = function(o) {
TxProposals.fromObj = function(o, forceOpts) {
var ret = new TxProposals({
networkName: o.networkName,
walletId: o.walletId,
});
o.txps.forEach(function(o2) {
var t = TxProposal.fromObj(o2);
var t = TxProposal.fromObj(o2, forceOpts);
if (t.builder) {
var id = t.builder.build().getNormalizedHash().toString('hex');
var id = t.getID();
ret.txps[id] = t;
}
});