ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-12-06 17:27:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from ripple/unfunded-orders

Browse Source 
Update unfunded order tracking - fix native/non-native currency discrepancies
This commit is contained in:
wltsmrz
2014-08-20 16:00:08 -07:00
parent fff7a6bc9e 3cb337e7ec
commit 5ce91a027c
2 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/js/ripple/orderbook.js
View File

@@ -369,40 +369,33 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
return offer;
}
function sixFigures(str) {
return str.substring(0, str.indexOf('.') + 7);
};
var iouSuffix = '/' + this._currencyGets.to_json()
+ '/' + this._issuerGets;
var takerGetsValue = (typeof offer.TakerGets === 'object')
? offer.TakerGets.value
: offer.TakerGets;
var takerPaysValue = (typeof offer.TakerPays === 'object')
? offer.TakerPays.value
: offer.TakerPays;
var iouSuffix = '/USD/rrrrrrrrrrrrrrrrrrrrBZbvji';
var fundedTakerGets = Amount.from_json(fundedAmount + iouSuffix);
var takerGets = Amount.from_json(takerGetsValue + iouSuffix);
var takerPays = Amount.from_json(takerPaysValue + iouSuffix);
offer.is_fully_funded = fundedTakerGets.compareTo(takerGets) >= 0;
offer.is_fully_funded = Amount.from_json(
this._currencyGets.is_native() ? fundedAmount : fundedAmount + iouSuffix
).compareTo(Amount.from_json(offer.TakerGets)) >= 0;
if (offer.is_fully_funded) {
offer.taker_gets_funded = takerGetsValue;
offer.taker_pays_funded = takerPaysValue;
return offer;
}
offer.taker_gets_funded = fundedAmount;
var rate = Amount.from_json(offer.TakerPays).divide(offer.TakerGets);
var takerPaysFunded = fundedTakerGets.multiply(rate);
if (takerPaysFunded.compareTo(takerPays) <= 0) {
offer.taker_pays_funded = takerPaysFunded.to_text();
offer.taker_gets_funded = Amount.from_json(offer.TakerGets).to_text();
offer.taker_pays_funded = Amount.from_json(offer.TakerPays).to_text();
} else {
offer.taker_pays_funded = takerPaysValue;
offer.taker_gets_funded = fundedAmount;
var rate = Amount.from_json(offer.TakerPays)
.divide(Amount.from_json(offer.TakerGets));
var fundedPays = Amount.from_json(
this._currencyPays.is_native()
? fundedAmount
: fundedAmount + '/' + this._currencyPays.to_json() + '/' + this._issuerPays
).multiply(rate);
if (fundedPays.compareTo(Amount.from_json(offer.TakerPays)) <= 0) {
offer.taker_pays_funded = fundedPays.to_text();
} else {
offer.taker_pays_funded = Amount.from_json(offer.TakerPays).to_text();
}
}
return offer;