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

fix fee / feeSat opts

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-09-09 10:43:13 -03:00
commit 740be93836
2 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/models/core/TxProposal.js
View file

@ -125,12 +125,22 @@ TxProposal._trim = function(o) {
TxProposal.fromObj = function(o, forceOpts) {
preconditions.checkArgument(o.builderObj);
delete o['builder'];
forceOpts = forceOpts || {};
// force opts is requested.
for (var k in forceOpts) {
o.builderObj.opts[k] = forceOpts[k];
}
// Handle undef options
if (_.isUndefined(forceOpts.fee) && _.isUndefined(forceOpts.feeSat)) {
if (o.builderObj.opts) {
o.builderObj.opts.fee = undefined;
o.builderObj.opts.feeSat = undefined;
}
}
try {
// force opts is requested.
for (var k in forceOpts) {
o.builderObj.opts[k] = forceOpts[k];
}
o.builder = TransactionBuilder.fromObj(o.builderObj);
} catch (e) {
throw new Error("Invalid or Incompatible Backup Detected.");