mirror of
https://github.com/Xahau/xahau.js.git
synced 2025-12-06 17:27:59 +00:00
Adjust taker_pays_funded
This commit is contained in:
@@ -284,10 +284,8 @@ OrderBook.prototype.applyTransferRate = function(balance, transferRate) {
|
||||
return balance;
|
||||
}
|
||||
|
||||
var adjustedBalance = Amount.from_json(balance
|
||||
+ '/' + this._currencyGets.to_json()
|
||||
+ '/' + this._issuerGets
|
||||
)
|
||||
var iouSuffix = '/USD/rrrrrrrrrrrrrrrrrrrrBZbvji';
|
||||
var adjustedBalance = Amount.from_json(balance + iouSuffix)
|
||||
.divide(transferRate)
|
||||
.multiply(Amount.from_json(OrderBook.DEFAULT_TRANSFER_RATE))
|
||||
.to_json()
|
||||
@@ -352,22 +350,43 @@ OrderBook.prototype.setFundedAmount = function(offer, fundedAmount) {
|
||||
assert.strictEqual(typeof offer, 'object', 'Offer is invalid');
|
||||
assert(!isNaN(fundedAmount), 'Funds is invalid');
|
||||
|
||||
var iouSuffix = '/USD/rrrrrrrrrrrrrrrrrrrrBZbvji';
|
||||
if (fundedAmount === '0') {
|
||||
offer.taker_gets_funded = '0';
|
||||
offer.taker_pays_funded = '0';
|
||||
offer.is_fully_funded = false;
|
||||
return offer;
|
||||
}
|
||||
|
||||
var takerGetsValue = (typeof offer.TakerGets === 'object')
|
||||
? offer.TakerGets.value
|
||||
: offer.TakerGets;
|
||||
|
||||
var takerGets = Amount.from_json(takerGetsValue + iouSuffix);
|
||||
var takerPaysValue = (typeof offer.TakerPays === 'object')
|
||||
? offer.TakerPays.value
|
||||
: offer.TakerPays;
|
||||
|
||||
offer.is_fully_funded = Amount.from_json(
|
||||
fundedAmount + iouSuffix
|
||||
).compareTo(takerGets) >= 0;
|
||||
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;
|
||||
|
||||
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();
|
||||
} else {
|
||||
offer.taker_gets_funded = fundedAmount;
|
||||
offer.taker_pays_funded = takerPaysValue;
|
||||
}
|
||||
|
||||
return offer;
|
||||
@@ -882,15 +901,25 @@ OrderBook.prototype.updateOfferFunds = function(account, fundedAmount) {
|
||||
for (var i=0; i<this._offers.length; i++) {
|
||||
var offer = this._offers[i];
|
||||
|
||||
if (offer.Account === account) {
|
||||
// Update funds for account's offer
|
||||
var previousOffer = extend({}, offer);
|
||||
var previousAmount = offer.taker_gets_funded;
|
||||
if (offer.Account !== account) {
|
||||
continue;
|
||||
}
|
||||
|
||||
this.setFundedAmount(offer, fundedAmount);
|
||||
var previousOffer = extend({}, offer);
|
||||
var previousFundedGets = Amount.from_json(offer.taker_gets_funded);
|
||||
|
||||
this.setFundedAmount(offer, fundedAmount);
|
||||
|
||||
var hasChangedFunds = !previousFundedGets.equals(
|
||||
Amount.from_json(offer.taker_gets_funded));
|
||||
|
||||
if (hasChangedFunds) {
|
||||
this.emit('offer_changed', previousOffer, offer);
|
||||
this.emit('offer_funds_changed', offer, previousAmount, fundedAmount);
|
||||
this.emit(
|
||||
'offer_funds_changed', offer,
|
||||
previousOffer.taker_gets_funded,
|
||||
fundedAmount
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user