Skip to content

Commit

Permalink
[0.4]client/{core,ui}: Fix unit info and asset id / symbol usage on m…
Browse files Browse the repository at this point in the history 
…arkets page

We were expecting a SupportedAsset in some places where it wasn't guaranteed.
Update Application.unitInfo method to accept optional xc [core.Exchange] argument
from which to look for UnitInfo. Pass the arg in relevant contexts.
Use MarketsPage.market.{baseCfg,quoteCfg} [dex.Asset] instead of
{base,quote} [core.SupportedAsset] in book-related code.
  • Loading branch information
@buck54321 @chappjc
buck54321 authored and chappjc committed Jan 21, 2022
1 parent 013abc2 commit 207ddcf
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 57 deletions.
17 changes: 9 additions & 8 deletions client/core/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6122,15 +6122,16 @@ func (c *Core) cacheRedemptionFeeSuggestion(t *trackedTrade) {

// convertAssetInfo converts from a *msgjson.Asset to the nearly identical
// *dex.Asset.
func convertAssetInfo(asset *msgjson.Asset) *dex.Asset {
func convertAssetInfo(ai *msgjson.Asset) *dex.Asset {
return &dex.Asset{
ID: asset.ID,
Symbol: asset.Symbol,
Version: asset.Version,
MaxFeeRate: asset.MaxFeeRate,
SwapSize: asset.SwapSize,
SwapSizeBase: asset.SwapSizeBase,
SwapConf: uint32(asset.SwapConf),
ID: ai.ID,
Symbol: ai.Symbol,
Version: ai.Version,
MaxFeeRate: ai.MaxFeeRate,
SwapSize: ai.SwapSize,
SwapSizeBase: ai.SwapSizeBase,
SwapConf: uint32(ai.SwapConf),
UnitInfo: ai.UnitInfo,
}
}

Expand Down
12 changes: 10 additions & 2 deletions client/webserver/site/src/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,8 +670,16 @@ export default class Application {
}
}

/* unitInfo fetches unit info [dex.UnitInfo] for the asset */
unitInfo (assetID) { return this.assets[assetID].info.unitinfo }
/*
* unitInfo fetches unit info [dex.UnitInfo] for the asset. If xc
* [core.Exchange] is provided, and this is not a SupportedAsset, the UnitInfo
* sent from the exchange's assets map [dex.Asset] will be used.
*/
unitInfo (assetID, xc) {
const supportedAsset = this.assets[assetID]
if (supportedAsset) return supportedAsset.info.unitinfo
return xc.assets[assetID].unitInfo
}

/* conventionalRate converts the encoded atomic rate to a conventional rate */
conventionalRate (baseID, quoteID, encRate) {
Expand Down
12 changes: 2 additions & 10 deletions client/webserver/site/src/js/forms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,9 @@ export class FeeAssetSelectionForm {
const marketTmpl = Doc.parseTemplate(marketNode)

const baseAsset = xc.assets[mkt.baseid]
const baseUnitInfo = unitInfo(xc, mkt.baseid)
const baseUnitInfo = app().unitInfo(mkt.baseid, xc)
const quoteAsset = xc.assets[mkt.quoteid]
const quoteUnitInfo = unitInfo(xc, mkt.quoteid)
const quoteUnitInfo = app().unitInfo(mkt.quoteid, xc)

if (cFactor(baseUnitInfo) === 0 || cFactor(quoteUnitInfo) === 0) return null

Expand Down Expand Up @@ -1003,11 +1003,3 @@ export function bind (form, submitBttn, handler) {
function isTruthyString (s) {
return s === '1' || s.toLowerCase() === 'true'
}

function unitInfo (xc, assetID) {
const dexAsset = xc.assets[assetID]
if (dexAsset && dexAsset.unitInfo.conventional.conversionFactor > 0) return dexAsset.unitInfo
const supportedAsset = app().assets[assetID]
if (!supportedAsset) return null
return supportedAsset.info.unitinfo
}
70 changes: 33 additions & 37 deletions client/webserver/site/src/js/markets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -416,8 +416,7 @@ export default class MarketsPage extends BasePage {
Doc.hide(page.orderForm)
const feePaid = !this.hasFeePending()
const assetsAreSupported = this.assetsAreSupported()
const base = this.market.base
const quote = this.market.quote
const { base, quote } = this.market
const hasWallets = base && app().assets[base.id].wallet && quote && app().assets[quote.id].wallet

if (feePaid && assetsAreSupported && hasWallets) {
Expand Down Expand Up @@ -540,8 +539,10 @@ export default class MarketsPage extends BasePage {

const baseCfg = dex.assets[base]
const quoteCfg = dex.assets[quote]
const [baseAsset, quoteAsset] = [app().assets[base], app().assets[quote]]
const rateConversionFactor = Order.RateEncodingFactor / baseAsset.info.unitinfo.conventional.conversionFactor * quoteAsset.info.unitinfo.conventional.conversionFactor

const [bui, qui] = [app().unitInfo(base, dex), app().unitInfo(quote, dex)]

const rateConversionFactor = Order.RateEncodingFactor / bui.conventional.conversionFactor * qui.conventional.conversionFactor
Doc.hide(page.maxOrd, page.chartErrMsg)
if (this.preorderTimer) {
window.clearTimeout(this.preorderTimer)
Expand All @@ -554,8 +555,10 @@ export default class MarketsPage extends BasePage {
cfg: dex.markets[mktId],
// app().assets is a map of core.SupportedAsset type, which can be found at
// client/core/types.go.
base: baseAsset,
quote: quoteAsset,
base: app().assets[base],
quote: app().assets[quote],
baseUnitInfo: bui,
quoteUnitInfo: qui,
maxSell: null,
maxBuys: {},
candleCaches: {},
Expand Down Expand Up @@ -593,8 +596,7 @@ export default class MarketsPage extends BasePage {
*/
reportDepthVolume (d) {
const page = this.page
const { base, quote } = this.market
const [b, q] = [base.info.unitinfo, quote.info.unitinfo]
const { baseUnitInfo: b, quoteUnitInfo: q } = this.market
// DepthChart reports volumes in conventional units. We'll still use
// formatCoinValue for formatting though.
page.sellBookedBase.textContent = Doc.formatCoinValue(d.sellBase * b.conventional.conversionFactor, b)
Expand Down Expand Up @@ -652,7 +654,7 @@ export default class MarketsPage extends BasePage {
page.candleEnd.textContent = Doc.formatCoinValue(candle.endRate / this.market.rateConversionFactor)
page.candleHigh.textContent = Doc.formatCoinValue(candle.highRate / this.market.rateConversionFactor)
page.candleLow.textContent = Doc.formatCoinValue(candle.lowRate / this.market.rateConversionFactor)
page.candleVol.textContent = Doc.formatCoinValue(candle.matchVolume, this.market.base.info.unitinfo)
page.candleVol.textContent = Doc.formatCoinValue(candle.matchVolume, this.market.baseUnitInfo)
Doc.show(page.hoverData)
}

Expand All @@ -675,7 +677,7 @@ export default class MarketsPage extends BasePage {
sell: sell,
base: market.base.id,
quote: market.quote.id,
qty: convertConventional(qtyField.value, conventionalFactor(market.base)),
qty: convertConventional(qtyField.value, market.baseUnitInfo.conventional.conversionFactor),
rate: convertConventional(page.rateField.value, market.rateConversionFactor), // message-rate
tifnow: page.tifNow.checked
}
Expand All @@ -686,6 +688,7 @@ export default class MarketsPage extends BasePage {
*/
previewQuoteAmt (show) {
const page = this.page
if (!this.market.base || !this.market.quote) return // Not a supported asset
const order = this.parseOrder()
const adjusted = this.adjustedRate()
page.orderErr.textContent = ''
Expand All @@ -708,7 +711,7 @@ export default class MarketsPage extends BasePage {
}
const quoteAsset = app().assets[order.quote]
const quoteQty = order.qty * order.rate / Order.RateEncodingFactor
const total = Doc.formatCoinValue(quoteQty, this.market.quote.info.unitinfo)
const total = Doc.formatCoinValue(quoteQty, this.market.quoteUnitInfo)

page.orderPreview.textContent = intl.prep(intl.ID_ORDER_PREVIEW, { total, asset: quoteAsset.symbol.toUpperCase() })
if (this.isSell()) this.preSell()
Expand Down Expand Up @@ -854,7 +857,7 @@ export default class MarketsPage extends BasePage {

/* handleBook accepts the data sent in the 'book' notification. */
handleBook (data) {
const { cfg, base, quote, baseCfg, quoteCfg } = this.market
const { cfg, baseUnitInfo, quoteUnitInfo, baseCfg, quoteCfg } = this.market
this.book = new OrderBook(data, baseCfg.symbol, quoteCfg.symbol)
this.loadTable()
for (const order of (data.book.epoch || [])) {
Expand All @@ -867,7 +870,7 @@ export default class MarketsPage extends BasePage {
Doc.empty(this.page.sellRows)
return
}
this.depthChart.set(this.book, cfg.lotsize, cfg.ratestep, base.info.unitinfo, quote.info.unitinfo)
this.depthChart.set(this.book, cfg.lotsize, cfg.ratestep, baseUnitInfo, quoteUnitInfo)
}

/*
Expand All @@ -878,8 +881,8 @@ export default class MarketsPage extends BasePage {
midGapConventional () {
const gap = this.midGap()
if (!gap) return gap
const { base, quote } = this.market
return gap * base.info.unitinfo.conventional.conversionFactor / quote.info.unitinfo.conventional.conversionFactor
const { baseUnitInfo: b, quoteUnitInfo: q } = this.market
return gap * b.conventional.conversionFactor / q.conventional.conversionFactor
}

/*
Expand Down Expand Up @@ -914,7 +917,7 @@ export default class MarketsPage extends BasePage {
const buffer = xc.markets[market.sid].buybuffer
const gap = this.midGapConventional()
if (gap) {
this.page.minMktBuy.textContent = Doc.formatCoinValue(lotSize * buffer * gap, market.base.info.unitinfo)
this.page.minMktBuy.textContent = Doc.formatCoinValue(lotSize * buffer * gap, market.baseUnitInfo)
}
}

Expand Down Expand Up @@ -998,7 +1001,7 @@ export default class MarketsPage extends BasePage {
updateDataCol(tr, 'side', Order.sellString(ord))
updateDataCol(tr, 'age', Doc.timeSince(ord.stamp))
updateDataCol(tr, 'rate', Doc.formatCoinValue(ord.rate / this.market.rateConversionFactor))
updateDataCol(tr, 'qty', Doc.formatCoinValue(ord.qty, this.market.base.info.unitinfo))
updateDataCol(tr, 'qty', Doc.formatCoinValue(ord.qty, this.market.baseUnitInfo))
updateDataCol(tr, 'filled', `${(ord.filled / ord.qty * 100).toFixed(1)}%`)
updateDataCol(tr, 'settled', `${(Order.settled(ord) / ord.qty * 100).toFixed(1)}%`)
updateDataCol(tr, 'status', Order.statusString(ord))
Expand Down Expand Up @@ -1040,8 +1043,7 @@ export default class MarketsPage extends BasePage {
const midGapValue = this.midGapConventional()
if (!midGapValue) return

const market = this.market
const [b, q] = [market.baseCfg, market.quoteCfg]
const { baseCfg: b, quoteCfg: q } = this.market
const baseSymb = b.symbol.toUpperCase()
const quoteSymb = q.symbol.toUpperCase()
// more than 6 numbers it gets too big for the title.
Expand Down Expand Up @@ -1072,7 +1074,7 @@ export default class MarketsPage extends BasePage {
quote: mktBook.quote
})

page.lotSize.textContent = Doc.formatCoinValue(market.cfg.lotsize, market.base.info.unitinfo)
page.lotSize.textContent = Doc.formatCoinValue(market.cfg.lotsize, market.baseUnitInfo)
page.rateStep.textContent = Doc.formatCoinValue(market.cfg.ratestep / market.rateConversionFactor)
this.baseUnits.forEach(el => { el.textContent = b.symbol.toUpperCase() })
this.quoteUnits.forEach(el => { el.textContent = q.symbol.toUpperCase() })
Expand Down Expand Up @@ -1146,7 +1148,7 @@ export default class MarketsPage extends BasePage {
const dur = data.payload.dur
this.market.candleCaches[dur] = data.payload
if (this.currentChart !== candleChart || this.candleDur !== dur) return
this.candleChart.setCandles(data.payload, this.market.cfg, this.market.base.info.unitinfo, this.market.quote.info.unitinfo)
this.candleChart.setCandles(data.payload, this.market.cfg, this.market.baseUnitInfo, this.market.quoteUnitInfo)
}

/* handleCandleUpdateRoute is the handler for 'candle_update' notifications. */
Expand Down Expand Up @@ -1422,13 +1424,13 @@ export default class MarketsPage extends BasePage {
const mkt = this.market
const avail = note.balance.available
switch (note.assetID) {
case mkt.base.id:
case mkt.baseCfg.id:
// If we're not showing the max order panel yet, don't do anything.
if (!mkt.maxSell) break
if (typeof mkt.sellBalance === 'number' && mkt.sellBalance !== avail) mkt.maxSell = null
if (this.isSell()) this.preSell()
break
case mkt.quote.id:
case mkt.quoteCfg.id:
if (!Object.keys(mkt.maxBuys).length) break
if (typeof mkt.buyBalance === 'number' && mkt.buyBalance !== avail) mkt.maxBuys = {}
if (!this.isSell()) this.preBuy()
Expand Down Expand Up @@ -1503,7 +1505,7 @@ export default class MarketsPage extends BasePage {
}
const lotSize = this.market.cfg.lotsize
page.lotField.value = lots
page.qtyField.value = Doc.formatCoinValue(lots * lotSize, this.market.base.info.unitinfo)
page.qtyField.value = Doc.formatCoinValue(lots * lotSize, this.market.baseUnitInfo)
this.previewQuoteAmt(true)
}

Expand All @@ -1524,7 +1526,7 @@ export default class MarketsPage extends BasePage {
const adjusted = lots * lotSize
page.lotField.value = lots
if (!order.isLimit && !order.sell) return
if (finalize) page.qtyField.value = Doc.formatCoinValue(adjusted, this.market.base.info.unitinfo)
if (finalize) page.qtyField.value = Doc.formatCoinValue(adjusted, this.market.baseUnitInfo)
this.previewQuoteAmt(true)
}

Expand All @@ -1534,7 +1536,7 @@ export default class MarketsPage extends BasePage {
*/
marketBuyChanged () {
const page = this.page
const qty = convertConventional(page.mktBuyField.value, conventionalFactor(this.market.quote))
const qty = convertConventional(page.mktBuyField.value, this.market.quoteUnitInfo.conventional.conversionFactor)
const gap = this.midGap()
if (!gap || !qty) {
page.mktBuyLots.textContent = '0'
Expand All @@ -1544,7 +1546,7 @@ export default class MarketsPage extends BasePage {
const lotSize = this.market.cfg.lotsize
const received = qty / gap
page.mktBuyLots.textContent = (received / lotSize).toFixed(1)
page.mktBuyScore.textContent = Doc.formatCoinValue(received, this.market.base.info.unitinfo)
page.mktBuyScore.textContent = Doc.formatCoinValue(received, this.market.baseUnitInfo)
}

/*
Expand Down Expand Up @@ -1706,8 +1708,8 @@ export default class MarketsPage extends BasePage {
*/
orderTableRow (orderBin) {
const tr = this.page.rowTemplate.cloneNode(true)
const { base, rateConversionFactor } = this.market
const manager = new OrderTableRowManager(tr, orderBin, base.info.unitinfo, rateConversionFactor)
const { baseUnitInfo, rateConversionFactor } = this.market
const manager = new OrderTableRowManager(tr, orderBin, baseUnitInfo, rateConversionFactor)
tr.manager = manager
bind(tr, 'click', () => {
this.reportDepthClick(tr.manager.getRate() / rateConversionFactor)
Expand Down Expand Up @@ -1819,8 +1821,8 @@ export default class MarketsPage extends BasePage {
}
}, 10000)
}
const { dex, base, quote } = this.market
ws.request('loadcandles', { host: dex.host, base: base.id, quote: quote.id, dur: this.candleDur })
const { dex, baseCfg, quoteCfg } = this.market
ws.request('loadcandles', { host: dex.host, base: baseCfg.id, quote: quoteCfg.id, dur: this.candleDur })
}

/*
Expand Down Expand Up @@ -2166,12 +2168,6 @@ function makeMarket (host, base, quote) {
/* marketID creates a DEX-compatible market name from the ticker symbols. */
export function marketID (b, q) { return `${b}_${q}` }

/*
* conventionalFactor picks out the conversion factor for conventional units for
* the asset [core.SupportedAsset].
*/
function conventionalFactor (asset) { return asset.info.unitinfo.conventional.conversionFactor }

/* convertConventional converts the float string to atoms. */
function convertConventional (s, conversionFactor) {
return Math.round(parseFloat(s) * conversionFactor)
Expand Down

0 comments on commit 207ddcf

Please sign in to comment.