@@ -58,201 +58,277 @@
{{- /* WALLET DETAILS */ -}}
-
+
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
- ~ USD
-
-
-
-
- [[[Token on]]]
- ![]()
-
-
-
-
-
-
-
-
+ {{- /* BALANCE, SEND & RECEIVE */ -}}
+
+
| - - - | -- |
+
+ ![]()
+
-
-
-
-
+
-
-
+
+
+
+
+
+ ~ USD
-
-
-
-
| [[[Status]]] | -[[[:title:locked]]] | -||||||
| [[[Status]]] | -[[[:title:ready]]] | -||||||
| [[[Status]]] | -[[[:title:off]]] | -||||||
| [[[Status]]] | -[[[Disabled]]] | -||||||
| - - | -|||||||
| - - | -|||||||
| - - | -|||||||
| [[[Wallet Type]]] | -- | ||||||
| [[[Peer Count]]] | -+ | Network | +Allocation | +Available | +Locked | +Pending | +|
|---|---|---|---|---|---|---|---|
| [[[Block Sync]]] | -- | ||||||
| [[[Balance Discovery]]] | -- |
-
-
- [[[Finding Addresses]]]
+ | |||||
|
+
+
|
+ — | +— | +— | +— | ++ + + |
-
-
-
-
+ [[[add_provider_tooltip]]]
-
+
+
-
+
+ [[[Receive]]]
+
+
+
+
- {{- /* FEE INFO */ -}}
-
-
- Network Fee Rate
-
-
-
-
- /
-
+ {{- /* TRANSACTION FEES */ -}}
+
+
{{/* END WALLET DETAILS */}}
{{- /* SECOND COLUMN */ -}}
+
+
+ {{- /* SINGLE-NETWORK ASSET TX FEES */ -}}
+ Transaction Fees
+
+
+
+ Send
+
+
+ <
+ $
+
+
-
+
+
+
+
+
- Exchange Rate
-
-
- USD/
+
+
-
+ Sell
+
+
+ <
+ $
+
+
-
-
-
+
+
@@ -349,7 +425,6 @@
[[[staking_disabled]]]
- {{- /* END STAKING */ -}}
{{- /* MIXING */ -}}
@@ -378,60 +453,37 @@
{{- /* END MIXING */ -}}
+
+ {{- /* ASSET DOCUMENTATION */ -}}
+
- Send Fees
-
-
-
+
-
+
+
- and up
-
-
- ~
- USD
-
+
- Sell Fees
-
-
-
-
- and up
+
+
+
+ {{- /* MULTI-NETWORK ASSET TX FEES */ -}}
+
+ Buy
+
+
+ <
+ $
+
-
- ~
- USD
-
-
-
- Buy Fees
-
-
-
+
+
+
+
+
- and up
-
-
- ~
- USD
-
+
+
+ Rate
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{- /* WALLET CONFIGURATION */ -}}
+ | Network | +Send | +Buy | +Sell | +Rate | +||
|---|---|---|---|---|---|---|
|
+
+
+ |
+
+
+
+
+ <
+ $
+
+
+
+
+
+
+
+
+
+
+ |
+ + + / + | +— | +— | +— | +— | +
+
+
+ ![]()
+ Wallet Configuration
+
+
+
+
+
+ [[[:title:locked]]]
+
+
+
+ [[[:title:ready]]]
+
+
+
+ [[[:title:off]]]
+
+
+
+ [[[Disabled]]]
+
+
+
+ Syncing
+
+
+
+
+ {{- /* SYNC STATUS */ -}}
+
+ [[[Type]]]
+
+
+
+ Class
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [[[Peer Count]]]
+ —
+
+
+ [[[Block Sync]]]
+ —
+
+
+ Blocks
+ —
+
+
+ [[[Balance Discovery]]]
+
+
+
+
+
+ [[[Finding Addresses]]]
+
+
+
+
+
+ {{template "dcrDocs"}}
+ {{template "btcDocs"}}
+ {{template "ethDocs"}}
+ {{template "usdcDocs"}}
+ {{template "usdtDocs"}}
+ {{template "ltcDocs"}}
+ {{template "dogeDocs"}}
+ {{template "dashDocs"}}
+ {{template "dgbDocs"}}
+ {{template "zecDocs"}}
+ {{template "firoDocs"}}
+ {{template "bchDocs"}}
+ {{template "polDocs"}}
+
- {{- /* TRANSACTION HISTORY */ -}}
-
-
requiredActions: Record
onionUrl: string
+ dynamicUnits: {
+ div: PageElement
+ rows: PageElement
+ }
constructor () {
this.notes = []
@@ -202,6 +206,13 @@ export default class Application {
}
document.body.classList.add('loaded')
+ const div = document.createElement('div') as PageElement
+ div.classList.add('position-absolute', 'p-3')
+ const rows = document.createElement('div') as PageElement
+ div.appendChild(rows)
+ rows.classList.add('body-bg', 'border')
+ this.dynamicUnits = { div, rows }
+
// Loggers can be enabled by setting a truthy value to the loggerID using
// enableLogger. Settings are stored across sessions. See docstring for the
// log method for more info.
@@ -415,13 +426,8 @@ export default class Application {
* display elements. The menu gives users an option to convert the value
* to their preferred units.
*/
- bindUnits (main: PageElement) {
- const div = document.createElement('div') as PageElement
- div.classList.add('position-absolute', 'p-3')
- // div.style.backgroundColor = 'yellow'
- const rows = document.createElement('div') as PageElement
- div.appendChild(rows)
- rows.classList.add('body-bg', 'border')
+ bindUnits (ancestor: PageElement) {
+ const { div, rows } = this.dynamicUnits
const addRow = (el: PageElement, unit: string, cFactor: number) => {
const box = Doc.safeSelector(el, '[data-unit-box]')
const atoms = parseInt(box.dataset.atoms as string)
@@ -434,9 +440,9 @@ export default class Application {
Doc.setText(el, '[data-unit]', unit)
})
}
- for (const el of Doc.applySelector(main, '[data-conversion-value]')) {
+ for (const el of Doc.applySelector(ancestor, '[data-conversion-value]')) {
const box = Doc.safeSelector(el, '[data-unit-box]')
- Doc.bind(box, 'mouseenter', () => {
+ Doc.bind(box, 'click', () => {
Doc.empty(rows)
box.appendChild(div)
const lyt = Doc.layoutMetrics(box)
@@ -1619,22 +1625,6 @@ export default class Application {
clearTxHistory (assetID: number) {
delete this.txHistoryMap[assetID]
}
-
- async needsCustomProvider (assetID: number): Promise {
- const baseChainID = this.assets[assetID]?.token?.parentID ?? assetID
- if (!baseChainID) return false
- const w = this.walletMap[baseChainID]
- if (!w) return false
- const traitAccountLocker = 1 << 14
- if ((w.traits & traitAccountLocker) === 0) return false
- const res = await postJSON('/api/walletsettings', { assetID: baseChainID })
- if (!this.checkResponse(res)) {
- console.error(res.msg)
- return false
- }
- const settings = res.map as Record
- return !settings.providers
- }
}
/* getSocketURI returns the websocket URI for the client. */
diff --git a/client/webserver/site/src/js/doc.ts b/client/webserver/site/src/js/doc.ts
index 4934e526ca..9062932bf8 100644
--- a/client/webserver/site/src/js/doc.ts
+++ b/client/webserver/site/src/js/doc.ts
@@ -127,7 +127,7 @@ function convertToConventional (v: number, unitInfo?: UnitInfo) {
* 1 - (-5) = 6, so the conversion that has the order closest to
* bestDisplayOrder is the first one, 1,000 BTC.
*/
-const bestDisplayOrder = 1 // 10^1 => 1
+const bestDisplayOrder = 3 // 10^3 => 1000
/*
* resolveUnitConversions creates a lookup object mapping unit -> conversion
@@ -562,6 +562,10 @@ export default class Doc {
return d
}
+ static clone (node: HTMLElement): PageElement {
+ return node.cloneNode(true) as PageElement
+ }
+
/*
* timeSince returns a string representation of the duration since the
* specified unix timestamp (milliseconds).
diff --git a/client/webserver/site/src/js/forms.ts b/client/webserver/site/src/js/forms.ts
index d5b865a859..b7f8e344e3 100644
--- a/client/webserver/site/src/js/forms.ts
+++ b/client/webserver/site/src/js/forms.ts
@@ -45,7 +45,6 @@ interface ProgressPoint {
interface CurrentAsset {
asset: SupportedAsset
- parentAsset?: SupportedAsset
winfo: WalletInfo | Token
// selectedDef is used in a strange way for tokens. If a token's parent wallet
// already exists, then selectedDef is going to be the Token.definition.
@@ -56,12 +55,6 @@ interface CurrentAsset {
selectedDef: WalletDefinition
}
-interface WalletConfig {
- assetID: number
- config: Record
- walletType: string
-}
-
interface FormsConfig {
closed?: (closedForm: PageElement | undefined) => void
}
@@ -132,7 +125,6 @@ export class NewWalletForm {
current: CurrentAsset
subform: WalletConfigForm
walletCfgGuide: PageElement
- parentSyncer: null | ((w: WalletState) => void)
createUpdater: null | ((note: WalletCreationNote) => void)
constructor (form: HTMLElement, success: (assetID: number) => void, backFunc?: () => void) {
@@ -157,21 +149,10 @@ export class NewWalletForm {
bind(form, page.oneBttn, () => this.submit())
app().registerNoteFeeder({
- walletstate: (note: WalletStateNote) => { this.reportWalletState(note.wallet) },
- walletsync: (note: WalletSyncNote) => { if (this.parentSyncer) this.parentSyncer(app().walletMap[note.assetID]) },
createwallet: (note: WalletCreationNote) => { this.reportCreationUpdate(note) }
})
}
- /*
- * reportWalletState should be called when a 'walletstate' notification is
- * received.
- * TODO: Let form classes register for notifications.
- */
- reportWalletState (w: WalletState): void {
- if (this.parentSyncer) this.parentSyncer(w)
- }
-
/*
* reportWalletState should be called when a 'createwallet' notification is
* received.
@@ -180,13 +161,12 @@ export class NewWalletForm {
if (this.createUpdater) this.createUpdater(note)
}
- async createWallet (assetID: number, walletType: string, parentForm?: WalletConfig) {
+ async createWallet (assetID: number, walletType: string) {
const createForm = {
assetID: assetID,
pass: this.page.newWalletPass.value || '',
config: this.subform.map(assetID),
walletType: walletType,
- parentForm: parentForm
}
const ani = new Wave(this.form, { backgroundColor: true })
@@ -200,88 +180,17 @@ export class NewWalletForm {
const newWalletPass = page.newWalletPass as HTMLInputElement
Doc.hide(page.newWalletErr)
- const { asset, parentAsset } = this.current
+ const { asset } = this.current
const selectedDef = this.current.selectedDef
- let parentForm
let walletType = selectedDef.type
- if (parentAsset) {
- walletType = (asset.token as Token).definition.type
- parentForm = {
- assetID: parentAsset.id,
- config: this.subform.map(parentAsset.id),
- walletType: selectedDef.type
- }
- }
// Register the selected asset.
- const res = await this.createWallet(asset.id, walletType, parentForm)
+ const res = await this.createWallet(asset.id, walletType)
if (!app().checkResponse(res)) {
this.setError(res.msg)
return
}
newWalletPass.value = ''
- if (parentAsset) await this.runParentSync()
- else this.success(this.current.asset.id)
- }
-
- /*
- * runParentSync shows a syncing sub-dialog that tracks the parent asset's
- * syncProgress and informs the user that the token wallet will be created
- * after sync is complete.
- */
- async runParentSync () {
- const { page, current: { parentAsset, asset } } = this
- if (!parentAsset) return
-
- page.parentSyncPct.textContent = '0'
- page.parentName.textContent = parentAsset.name
- page.parentLogo.src = Doc.logoPath(parentAsset.symbol)
- page.childName.textContent = asset.name
- page.childLogo.src = Doc.logoPath(asset.symbol)
- Doc.hide(page.mainForm)
- Doc.show(page.parentSyncing)
-
- try {
- await this.syncParent(parentAsset)
- this.success(this.current.asset.id)
- } catch (error) {
- this.setError(error.message || error)
- }
- Doc.show(page.mainForm)
- Doc.hide(page.parentSyncing)
- }
-
- /*
- * syncParent monitors the sync progress of a token's parent asset, generating
- * an Error if the token wallet creation does not complete successfully.
- */
- syncParent (parentAsset: SupportedAsset): Promise {
- const { page, current: { asset } } = this
- return new Promise((resolve, reject) => {
- // First, check if it's already synced.
- const w = app().assets[parentAsset.id].wallet
- if (w && w.synced) return resolve()
- // Not synced, so create a syncer to update the parent sync pane.
- this.parentSyncer = (w: WalletState) => {
- if (w.assetID !== parentAsset.id) return
- page.parentSyncPct.textContent = (w.syncProgress * 100).toFixed(1)
- }
- // Handle the async result.
- this.createUpdater = (note: WalletCreationNote) => {
- if (note.assetID !== asset.id) return
- switch (note.topic) {
- case 'QueuedCreationFailed':
- reject(new Error(`${note.subject}: ${note.details}`))
- break
- case 'QueuedCreationSuccess':
- resolve()
- break
- default:
- return
- }
- this.parentSyncer = null
- this.createUpdater = null
- }
- })
+ this.success(this.current.asset.id)
}
/* setAsset sets the current asset of the NewWalletForm */
@@ -289,21 +198,15 @@ export class NewWalletForm {
if (!this.parseAsset(assetID)) return // nothing to change
const page = this.page
const tabs = page.walletTypeTabs
- const { winfo, asset, parentAsset } = this.current
+ const { winfo, asset } = this.current
page.assetName.textContent = winfo.name
page.newWalletPass.value = ''
Doc.empty(tabs)
Doc.hide(tabs, page.newWalletErr, page.tokenMsgBox)
this.page.assetLogo.src = Doc.logoPath(asset.symbol)
- if (parentAsset) {
- page.tokenParentLogo.src = Doc.logoPath(parentAsset.symbol)
- page.tokenParentName.textContent = parentAsset.name
- Doc.show(page.tokenMsgBox)
- }
- const pinfo = parentAsset ? parentAsset.info : null
- const walletDefs = pinfo ? pinfo.availablewallets : (winfo as WalletInfo).availablewallets ? (winfo as WalletInfo).availablewallets : [(winfo as Token).definition]
+ const walletDefs = (winfo as WalletInfo).availablewallets ? (winfo as WalletInfo).availablewallets : [(winfo as Token).definition]
if (walletDefs.length > 1) {
Doc.show(tabs)
@@ -323,8 +226,7 @@ export class NewWalletForm {
first.classList.add('selected')
}
- await this.update(this.current.selectedDef)
- if (asset.walletCreationPending) await this.runParentSync()
+ return this.update(this.current.selectedDef)
}
/*
@@ -347,7 +249,7 @@ export class NewWalletForm {
return true
}
if (!parentAsset.info) throw Error('this parent has no wallet info!')
- this.current = { asset, parentAsset, winfo: token, selectedDef: parentAsset.info.availablewallets[0] }
+ this.current = { asset, winfo: token, selectedDef: parentAsset.info.availablewallets[0] }
return true
}
@@ -375,7 +277,7 @@ export class NewWalletForm {
break
}
}
- const { asset, parentAsset, winfo } = this.current
+ const { asset } = this.current
const displayCreateBtn = walletDef.seeded || Boolean(asset.token)
if (displayCreateBtn && !containsRequired) {
Doc.hide(page.walletSettingsHeader)
@@ -390,20 +292,7 @@ export class NewWalletForm {
page.submitAdd.textContent = intl.prep(intl.ID_ADD)
}
- if (parentAsset) {
- const parentAndTokenOpts = JSON.parse(JSON.stringify(configOpts))
- // Add the regAsset field to the configurations so proper logos will be displayed
- // next to them, and map can filter them out. The opts are copied here so the originals
- // do not have the regAsset field added to them.
- for (const opt of parentAndTokenOpts) opt.regAsset = parentAsset.id
- const tokenOpts = (winfo as Token).definition.configopts || []
- if (tokenOpts.length > 0) {
- const tokenOptsCopy = JSON.parse(JSON.stringify(tokenOpts))
- for (const opt of tokenOptsCopy) opt.regAsset = asset.id
- parentAndTokenOpts.push(...tokenOptsCopy)
- }
- this.subform.update(asset.id, parentAndTokenOpts, false)
- } else this.subform.update(asset.id, configOpts, false)
+ this.subform.update(asset.id, configOpts, false)
this.setGuideLink(guideLink)
// A seeded or token wallet is internal to Bison Wallet and as such does
@@ -435,16 +324,11 @@ export class NewWalletForm {
*/
async loadDefaults () {
// No default config files for seeded assets right now.
- const { asset, parentAsset, selectedDef } = this.current
+ const { asset: { id: assetID }, selectedDef } = this.current
if (!selectedDef.configpath) return
- let configID = asset.id
- if (parentAsset) {
- if (selectedDef.seeded) return
- configID = parentAsset.id
- }
const loaded = app().loading(this.form)
const res = await postJSON('/api/defaultwalletcfg', {
- assetID: configID,
+ assetID,
type: selectedDef.type
})
loaded()
@@ -1220,7 +1104,6 @@ export class FeeAssetSelectionForm {
*/
function setReadyMessage (el: PageElement, asset: SupportedAsset) {
if (asset.wallet) el.textContent = intl.prep(intl.ID_WALLET_READY)
- else if (asset.walletCreationPending) el.textContent = intl.prep(intl.ID_WALLET_PENDING)
else el.textContent = intl.prep(intl.ID_SETUP_NEEDED)
el.classList.remove('readygreen', 'setuporange')
el.classList.add(asset.wallet ? 'readygreen' : 'setuporange')
@@ -1864,24 +1747,53 @@ export class DepositAddress {
form: PageElement
page: Record
assetID: number
+ netSelectBttnTmpl: PageElement
constructor (form: PageElement) {
this.form = form
- const page = this.page = Doc.idDescendants(form)
+ this.netSelectBttnTmpl = Doc.tmplElement(form, 'netSelectBttnTmpl')
+ this.netSelectBttnTmpl.remove()
+ const page = this.page = Doc.parseTemplate(form)
Doc.cleanTemplates(page.unifiedReceiverTmpl)
Doc.bind(page.newDepAddrBttn, 'click', async () => { this.newDepositAddress() })
Doc.bind(page.copyAddressBtn, 'click', () => { this.copyAddress() })
}
- /* Display a deposit address. */
+ async setAssetSelect (assetIDs: number[]) {
+ if (assetIDs.length === 1) {
+ this.setAsset(assetIDs[0])
+ return
+ }
+ const { page, netSelectBttnTmpl } = this
+ const assets = assetIDs.map((assetID: number) => app().assets[assetID])
+ assets.sort((a: SupportedAsset) => a.token ? 1 : -1)
+ const { symbol, unitInfo } = assets[0]
+ page.depositLogo.src = Doc.logoPath(symbol)
+ page.depositName.textContent = unitInfo.conventional.unit
+ Doc.hide(page.mainForm)
+ Doc.show(page.netSelectForm)
+ Doc.empty(page.netSelectBox)
+ for (const { id: assetID, symbol, token, name } of assets) {
+ const bttn = Doc.clone(netSelectBttnTmpl)
+ page.netSelectBox.appendChild(bttn)
+ const tmpl = Doc.parseTemplate(bttn)
+ const chainSymbol = token ? app().assets[token.parentID].symbol : symbol
+ tmpl.logo.src = Doc.logoPath(chainSymbol)
+ const chainName = token ? app().assets[token.parentID].name : name
+ tmpl.chainName.textContent = chainName
+ Doc.bind(bttn, 'click', () => this.setAsset(assetID))
+ }
+ }
+
async setAsset (assetID: number) {
this.assetID = assetID
const page = this.page
- Doc.hide(page.depositErr, page.depositTokenMsgBox)
+ Doc.hide(page.depositErr, page.depositTokenMsgBox, page.netSelectForm)
+ Doc.show(page.mainForm)
const asset = app().assets[assetID]
page.depositLogo.src = Doc.logoPath(asset.symbol)
- const wallet = app().walletMap[assetID]
page.depositName.textContent = asset.unitInfo.conventional.unit
+ const wallet = app().walletMap[assetID]
if (asset.token) {
const parentAsset = app().assets[asset.token.parentID]
page.depositTokenParentLogo.src = Doc.logoPath(parentAsset.symbol)
diff --git a/client/webserver/site/src/js/locales.ts b/client/webserver/site/src/js/locales.ts
index ff7b927234..dda612856f 100644
--- a/client/webserver/site/src/js/locales.ts
+++ b/client/webserver/site/src/js/locales.ts
@@ -53,7 +53,6 @@ export const ID_SETUP_WALLET = 'SETUP_WALLET'
export const ID_WALLET_READY = 'WALLET_READY'
export const ID_CHANGE_WALLET_TYPE = 'CHANGE_WALLET_TYPE'
export const ID_KEEP_WALLET_TYPE = 'KEEP_WALLET_TYPE'
-export const ID_WALLET_PENDING = 'WALLET_PENDING'
export const ID_SETUP_NEEDED = 'SETUP_NEEDED'
export const ID_SEND_SUCCESS = 'SEND_SUCCESS'
export const ID_RECONFIG_SUCCESS = 'RECONFIG_SUCCESS'
diff --git a/client/webserver/site/src/js/markets.ts b/client/webserver/site/src/js/markets.ts
index 689ea7771b..6b08760f57 100644
--- a/client/webserver/site/src/js/markets.ts
+++ b/client/webserver/site/src/js/markets.ts
@@ -3315,9 +3315,8 @@ class BalanceWidget {
// Just hide everything to start.
Doc.hide(
tmpl.newWalletRow, tmpl.expired, tmpl.unsupported, tmpl.connect, tmpl.spinner,
- tmpl.walletState, tmpl.balanceRows, tmpl.walletAddr, tmpl.wantProvidersBox
+ tmpl.walletState, tmpl.balanceRows, tmpl.walletAddr
)
- this.checkNeedsProvider(assetID, tmpl.wantProvidersBox)
tmpl.logo.src = Doc.logoPath(cfg.symbol)
tmpl.addWalletSymbol.textContent = cfg.symbol.toUpperCase()
Doc.empty(tmpl.symbol)
@@ -3333,10 +3332,6 @@ class BalanceWidget {
stateIcons.readWallet(wallet)
// Handle no wallet configured.
if (!wallet) {
- if (asset.walletCreationPending) {
- Doc.show(tmpl.spinner)
- return
- }
Doc.show(tmpl.newWalletRow)
return
}
@@ -3390,10 +3385,6 @@ class BalanceWidget {
} else Doc.hide(tmpl.expired)
}
- async checkNeedsProvider (assetID: number, el: PageElement) {
- Doc.setVis(await app().needsCustomProvider(assetID), el)
- }
-
/* updateParent updates the side's parent asset balance. */
updateParent (side: BalanceWidgetElement) {
const { wallet: { balance }, unitInfo } = app().assets[side.parentID]
diff --git a/client/webserver/site/src/js/registry.ts b/client/webserver/site/src/js/registry.ts
index a1e10b692f..39d39d714f 100644
--- a/client/webserver/site/src/js/registry.ts
+++ b/client/webserver/site/src/js/registry.ts
@@ -206,7 +206,6 @@ export interface SupportedAsset {
info?: WalletInfo
token?: Token
unitInfo: UnitInfo
- walletCreationPending: boolean
}
export interface Token {
@@ -245,13 +244,13 @@ export interface WalletState {
assetID: number
version: number
type: string
+ class: string
traits: number
open: boolean
running: boolean
disabled: boolean
balance: WalletBalance
address: string
- units: string
encrypted: boolean
peerCount: number
synced: boolean
@@ -1323,7 +1322,7 @@ export interface Application {
getWalletTx(assetID: number, txid: string): WalletTransaction | undefined
clearTxHistory(assetID: number): void
parentAsset(assetID: number): SupportedAsset
- needsCustomProvider (assetID: number): Promise
+ bindUnits (ancestor: PageElement): void
}
// TODO: Define an interface for Application?
diff --git a/client/webserver/site/src/js/wallets.ts b/client/webserver/site/src/js/wallets.ts
index f78569fe31..96de4561b4 100644
--- a/client/webserver/site/src/js/wallets.ts
+++ b/client/webserver/site/src/js/wallets.ts
@@ -19,7 +19,6 @@ import {
BalanceNote,
WalletStateNote,
WalletSyncNote,
- RateNote,
Order,
OrderFilter,
WalletCreationNote,
@@ -42,7 +41,8 @@ import {
TransactionNote,
WalletTransaction,
FeeState,
- WalletBalance
+ WalletBalance,
+ WalletInfo
} from './registry'
import { CoinExplorers } from './coinexplorers'
@@ -59,27 +59,141 @@ interface TicketPurchaseUpdate extends BaseWalletNote {
stats?: TicketStats
}
-interface AssetState {
+class ChainAsset {
+ assetID: number
symbol: string
+ ui: UnitInfo
+ chainName: string
+ chainLogo: string
ticker: string
- bal: WalletBalance
- xcRate: number
+ token?: {
+ parentMade: boolean
+ parentID: number
+ feeUI: UnitInfo
+ }
+
+ constructor (a: SupportedAsset) {
+ const { id: assetID, symbol, name, token, unitInfo: ui, unitInfo: { conventional: { unit: ticker } } } = a
+ this.assetID = assetID
+ this.ticker = ticker
+ this.symbol = symbol
+ this.ui = ui
+ this.chainName = token ? app().assets[token.parentID].name : name
+ this.chainLogo = token ? Doc.logoPath(app().assets[token.parentID].symbol) : Doc.logoPath(symbol)
+ if (token) this.token = { parentID: token.parentID, feeUI: app().unitInfo(token.parentID), parentMade: Boolean(app().assets[token.parentID].wallet) }
+ }
+
+ get bal () {
+ const w = app().assets[this.assetID].wallet
+ return w?.balance ?? { available: 0, locked: 0, immature: 0 }
+ }
+
+ updateTokenParentMade () {
+ if (!this.token) return false
+ this.token.parentMade = Boolean(app().assets[this.token.parentID].wallet)
+ }
}
-interface TickerAsset {
+class TickerAsset {
ticker: string // normalized e.g. WETH -> ETH
- hasTokens: boolean
+ hasWallets: boolean
cFactor: number
+ bestID: number
logoSymbol: string
- bal: {
- avail: number
- immature: number
- locked: number
- total: number
- }
- xcRate: number
- assets: AssetState[]
- lookup: Record
+ name: string
+ chainAssets: ChainAsset[]
+ chainAssetLookup: Record
+ haveAllFiatRates: boolean
+ isMultiNet: boolean
+ hasTokens: boolean
+ ui: UnitInfo
+
+ constructor (a: SupportedAsset) {
+ const { id: assetID, name, symbol, unitInfo: ui, unitInfo: { conventional: {conversionFactor: cFactor } } } = a
+ this.ticker = normalizedTicker(a)
+ this.cFactor = cFactor
+ this.chainAssets = []
+ this.chainAssetLookup = {}
+ this.bestID = assetID
+ this.name = name
+ this.logoSymbol = symbol
+ this.ui = ui
+ this.addChainAsset(a)
+ }
+
+ addChainAsset (a: SupportedAsset) {
+ const { id: assetID, symbol, name, wallet: w, token, unitInfo: ui } = a
+ const xcRate = app().fiatRatesMap[assetID]
+ if (!xcRate) this.haveAllFiatRates = false
+ this.hasTokens = this.hasTokens || Boolean(token)
+ if (!token) { // prefer the native asset data, e.g. weth.polygon -> eth}
+ this.bestID = assetID
+ this.logoSymbol = symbol
+ this.name = name
+ this.ui = ui
+ }
+ const ca = new ChainAsset(a)
+ this.hasWallets = this.hasWallets || Boolean(w) || Boolean(ca.token?.parentMade)
+ this.chainAssets.push(ca)
+ this.chainAssetLookup[a.id] = ca
+ this.chainAssets.sort((a: ChainAsset, b: ChainAsset) => {
+ if (a.token && !b.token) return 1
+ if (!a.token && b.token) return -1
+ return a.ticker.localeCompare(b.ticker)
+ })
+ this.isMultiNet = this.chainAssets.length > 1
+ }
+
+ walletInfo (): WalletInfo | undefined {
+ for (const { assetID } of this.chainAssets) {
+ const { info } = app().assets[assetID]
+ if (info) return info
+ }
+ }
+
+ updateHasWallets () {
+ for (const ta of this.chainAssets) {
+ ta.updateTokenParentMade()
+ const { assetID, token } = ta
+ if (app().walletMap[assetID] || token?.parentMade) {
+ this.hasWallets = true
+ return
+ }
+ }
+ }
+
+ /*
+ * blockchainWallet returns the assetID and wallet for the blockchain for
+ * which this ticker is a native asset, if it exists.
+ */
+ blockchainWallet () {
+ for (const { assetID } of this.chainAssets) {
+ const { wallet, token } = app().assets[assetID]
+ if (!token) return { assetID, wallet }
+ }
+ }
+
+ get avail () {
+ return this.chainAssets.reduce((sum: number, ca: ChainAsset) => sum + ca.bal.available, 0)
+ }
+
+ get immature () {
+ return this.chainAssets.reduce((sum: number, ca: ChainAsset) => sum + ca.bal.immature, 0)
+ }
+
+ get locked () {
+ return this.chainAssets.reduce((sum: number, ca: ChainAsset) => sum + ca.bal.locked, 0)
+ }
+
+ get total () {
+ return this.chainAssets.reduce((sum: number, { bal: { available, locked, immature } }: ChainAsset) => {
+ return sum + available + locked + immature
+ }, 0)
+ }
+
+ get xcRate () {
+ return app().fiatRatesMap[this.bestID]
+ }
}
const animationLength = 300
@@ -243,11 +357,14 @@ export default class WalletsPage extends BasePage {
data?: WalletsPageData
page: Record
- tickers: TickerAsset[]
- haveAllFiatRates: boolean
- totalUSD: number
-
- // assetButtons: Record
+ selectedTicker: TickerAsset
+ tickerMap: Record
+ tickerList: TickerAsset[]
+ balTracker: Record
+ tickerTemplates: Record>
+ tickerButtons: Record
+ balanceDetails: Record
+ walletConfig: Record
newWalletForm: NewWalletForm
reconfigForm: WalletConfigForm
walletCfgGuide: PageElement
@@ -261,7 +378,7 @@ export default class WalletsPage extends BasePage {
forceUrl: string
currentForm: PageElement
restoreInfoCard: HTMLElement
- selectedAssetID: number
+ selectedWalletID: number
stakeStatus: TicketStakingStatus
maxSend: number
unapprovingTokenVersion: number
@@ -279,6 +396,14 @@ export default class WalletsPage extends BasePage {
this.data = data
const page = this.page = Doc.idDescendants(body)
this.stampers = []
+ this.balTracker = {}
+ this.tickerTemplates = {}
+ this.tickerButtons = {}
+
+ this.balanceDetails = Doc.parseTemplate(page.balanceDetails)
+ this.walletConfig = Doc.parseTemplate(page.walletConfig)
+ this.walletConfig.div = page.walletConfig
+
net = app().user.net
const setStamp = () => {
@@ -292,7 +417,12 @@ export default class WalletsPage extends BasePage {
setStamp()
}, 10000) // update every 10 seconds
- Doc.cleanTemplates(page.restoreInfoCard, page.connectedIconTmpl, page.disconnectedIconTmpl, page.removeIconTmpl, page.tickerBalsBox)
+ Doc.cleanTemplates(
+ page.restoreInfoCard, page.connectedIconTmpl, page.disconnectedIconTmpl,
+ page.removeIconTmpl, page.tickerBalsBox, page.blockchainBalanceTmpl,
+ page.multiNetTxFeeTmpl, page.multiNetFeeRateTmpl, page.netTxFeeTmpl,
+ page.netSelectBttnTmpl
+ )
this.restoreInfoCard = page.restoreInfoCard.cloneNode(true) as HTMLElement
Doc.show(page.connectedIconTmpl, page.disconnectedIconTmpl, page.removeIconTmpl)
@@ -302,37 +432,40 @@ export default class WalletsPage extends BasePage {
})
Doc.bind(page.cancelForce, 'click', () => { this.closePopups() })
- this.selectedAssetID = -1
+ this.selectedWalletID = -1
Doc.cleanTemplates(
- page.iconSelectTmpl, page.balanceDetailRow, page.recentOrderTmpl, page.vspRowTmpl,
+ page.iconSelectTmpl, page.recentOrderTmpl, page.vspRowTmpl,
page.ticketHistoryRowTmpl, page.votingChoiceTmpl, page.votingAgendaTmpl, page.tspendTmpl,
page.tkeyTmpl, page.txHistoryRowTmpl, page.txHistoryDateRowTmpl
)
- Doc.bind(page.createWallet, 'click', () => this.showNewWallet(this.selectedAssetID))
- Doc.bind(page.connectBttn, 'click', () => this.doConnect(this.selectedAssetID))
- Doc.bind(page.send, 'click', () => this.showSendForm(this.selectedAssetID))
- Doc.bind(page.receive, 'click', () => this.showDeposit(this.selectedAssetID))
- Doc.bind(page.unlockBttn, 'click', () => this.openWallet(this.selectedAssetID))
- Doc.bind(page.lockBttn, 'click', () => this.lock(this.selectedAssetID))
- Doc.bind(page.reconfigureBttn, 'click', () => this.showReconfig(this.selectedAssetID))
- Doc.bind(page.needsProviderBttn, 'click', () => this.showReconfig(this.selectedAssetID))
- Doc.bind(page.rescanWallet, 'click', () => this.rescanWallet(this.selectedAssetID))
+ Doc.bind(page.createWallet, 'click', () => this.showNewWallet(this.selectedWalletID))
+ Doc.bind(page.connectBttn, 'click', () => this.doConnect(this.selectedWalletID))
+ Doc.bind(page.send, 'click', () => this.showSendForm())
+ Doc.bind(page.receive, 'click', () => this.showDeposit())
+ Doc.bind(page.unlockBttn, 'click', () => this.openWallet(this.selectedWalletID))
+ Doc.bind(page.lockBttn, 'click', () => this.lock(this.selectedWalletID))
+ Doc.bind(page.reconfigureBttn, 'click', () => this.showReconfig(this.selectedWalletID))
+ Doc.bind(page.rescanWallet, 'click', () => this.rescanWallet(this.selectedWalletID))
Doc.bind(page.earlierTxs, 'click', () => this.loadEarlierTxs())
-
Doc.bind(page.copyTxIDBtn, 'click', () => { setupCopyBtn(this.currTx?.id || '', page.txDetailsID, page.copyTxIDBtn, '#1e7d11') })
Doc.bind(page.copyRecipientBtn, 'click', () => { setupCopyBtn(this.currTx?.recipient || '', page.txDetailsRecipient, page.copyRecipientBtn, '#1e7d11') })
Doc.bind(page.copyBondIDBtn, 'click', () => { setupCopyBtn(this.currTx?.bondInfo?.bondID || '', page.txDetailsBondID, page.copyBondIDBtn, '#1e7d11') })
Doc.bind(page.copyBondAccountIDBtn, 'click', () => { setupCopyBtn(this.currTx?.bondInfo?.accountID || '', page.txDetailsBondAccountID, page.copyBondAccountIDBtn, '#1e7d11') })
- Doc.bind(page.hideMixTxsCheckbox, 'change', () => { this.showTxHistory(this.selectedAssetID) })
+ Doc.bind(page.hideMixTxsCheckbox, 'change', () => { this.showTxHistory(this.selectedWalletID) })
// Bind the new wallet form.
- this.newWalletForm = new NewWalletForm(page.newWalletForm, (assetID: number) => {
+ this.newWalletForm = new NewWalletForm(page.newWalletForm, async (assetID: number) => {
+ await app().fetchUser()
const fmtParams = { assetName: app().assets[assetID].name }
this.assetUpdated(assetID, page.newWalletForm, intl.prep(intl.ID_NEW_WALLET_SUCCESS, fmtParams))
- this.sortAssetButtons()
- this.updateTicketBuyer(assetID)
- this.updatePrivacy(assetID)
+ for (const ta of this.tickerList) ta.updateHasWallets()
+ this.refreshBalances()
+ this.sortTickers()
+ this.updateGlobalBalance()
+ if (this.selectedTicker.chainAssetLookup[assetID]) this.updateDisplayedTicker()
+ this.updateTicketBuyer()
+ this.updatePrivacy()
})
// Bind the wallet reconfig form.
@@ -399,10 +532,10 @@ export default class WalletsPage extends BasePage {
// Display fiat value for current send amount.
Doc.bind(page.sendAmt, 'input', () => {
- const { unitInfo: ui } = app().assets[this.selectedAssetID]
+ const { unitInfo: ui } = app().assets[this.selectedWalletID]
const amt = parseFloatDefault(page.sendAmt.value)
const conversionFactor = ui.conventional.conversionFactor
- Doc.showFiatValue(page.sendValue, amt * conversionFactor, app().fiatRatesMap[this.selectedAssetID], ui)
+ Doc.showFiatValue(page.sendValue, amt * conversionFactor, app().fiatRatesMap[this.selectedWalletID], ui)
})
// Clicking on maxSend on the send form should populate the amount field.
@@ -410,7 +543,7 @@ export default class WalletsPage extends BasePage {
// Validate send address on input.
Doc.bind(page.sendAddr, 'input', async () => {
- const asset = app().assets[this.selectedAssetID]
+ const asset = app().assets[this.selectedWalletID]
page.sendAddr.classList.remove('border-danger', 'border-success')
const addr = page.sendAddr.value || ''
if (!asset || addr === '') return
@@ -434,25 +567,29 @@ export default class WalletsPage extends BasePage {
Doc.show(page.changeWalletType, page.changeTypeHideIcon)
Doc.hide(page.changeTypeShowIcon)
page.changeTypeMsg.textContent = intl.prep(intl.ID_KEEP_WALLET_TYPE)
- } else this.showReconfig(this.selectedAssetID, { skipAnimation: true })
+ } else this.showReconfig(this.selectedWalletID, { skipAnimation: true })
})
app().registerNoteFeeder({
- fiatrateupdate: (note: RateNote) => { this.handleRatesNote(note) },
+ fiatrateupdate: () => { this.handleRatesNote() },
balance: (note: BalanceNote) => { this.handleBalanceNote(note) },
walletstate: (note: WalletStateNote) => { this.handleWalletStateNote(note) },
walletconfig: (note: WalletStateNote) => { this.handleWalletStateNote(note) },
- walletsync: (note: WalletSyncNote) => { this.updateSyncAndPeers(note.assetID) },
+ walletsync: (note: WalletSyncNote) => {
+ if (note.assetID === this.selectedWalletID) this.updateSyncAndPeers()
+ },
createwallet: (note: WalletCreationNote) => { this.handleCreateWalletNote(note) },
walletnote: (note: WalletNote) => { this.handleCustomWalletNote(note) }
})
this.prepareTickerAssets()
- const firstAsset = this.sortAssetButtons()
- let selectedAsset = firstAsset.id
- const assetIDStr = State.fetchLocal(State.selectedAssetLK)
- if (assetIDStr) selectedAsset = Number(assetIDStr)
- this.setSelectedAsset(selectedAsset)
+ const firstTicker = this.setTickerButtons()
+ this.refreshBalances()
+ this.updateGlobalBalance()
+ // let selectedAsset = firstAsset.id
+ // const assetIDStr = State.fetchLocal(State.selectedAssetLK)
+ // if (assetIDStr) selectedAsset = Number(assetIDStr)
+ this.setSelectedTicker(firstTicker)
setInterval(() => {
for (const row of this.page.txHistoryTableBody.children) {
@@ -469,9 +606,9 @@ export default class WalletsPage extends BasePage {
}
async safePost (path: string, args: any): Promise {
- const assetID = this.selectedAssetID
+ const assetID = this.selectedWalletID
const res = await postJSON(path, args)
- if (assetID !== this.selectedAssetID) throw Error('asset changed during request. aborting')
+ if (assetID !== this.selectedWalletID) throw Error('asset changed during request. aborting')
return res
}
@@ -600,7 +737,7 @@ export default class WalletsPage extends BasePage {
* currently selected asset to the DEXes that use that version.
*/
assetVersionUsedByDEXes (): Record {
- const assetID = this.selectedAssetID
+ const assetID = this.selectedWalletID
const versionToDEXes = {} as Record
const exchanges = app().exchanges
@@ -625,7 +762,7 @@ export default class WalletsPage extends BasePage {
const page = this.page
const path = '/api/unapprovetoken'
const res = await postJSON(path, {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
version: this.unapprovingTokenVersion
})
if (!app().checkResponse(res)) {
@@ -634,7 +771,7 @@ export default class WalletsPage extends BasePage {
return
}
- const assetExplorer = CoinExplorers[this.selectedAssetID]
+ const assetExplorer = CoinExplorers[this.selectedWalletID]
if (assetExplorer && assetExplorer[net]) {
page.unapproveTokenTxID.href = assetExplorer[net](res.txID)
}
@@ -652,7 +789,7 @@ export default class WalletsPage extends BasePage {
this.unapprovingTokenVersion = version
Doc.show(page.unapproveTokenSubmissionElements)
Doc.hide(page.unapproveTokenTxMsg, page.unapproveTokenErr)
- const asset = app().assets[this.selectedAssetID]
+ const asset = app().assets[this.selectedWalletID]
if (!asset || !asset.token) return
const parentAsset = app().assets[asset.token.parentID]
if (!parentAsset) return
@@ -662,7 +799,7 @@ export default class WalletsPage extends BasePage {
const path = '/api/approvetokenfee'
const res = await postJSON(path, {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
version: version,
approving: false
})
@@ -687,7 +824,7 @@ export default class WalletsPage extends BasePage {
*/
async showUnapproveTokenAllowanceTableForm () {
const page = this.page
- const asset = app().assets[this.selectedAssetID]
+ const asset = app().assets[this.selectedWalletID]
if (!asset || !asset.wallet || !asset.wallet.approved) return
while (page.tokenVersionBody.firstChild) {
page.tokenVersionBody.removeChild(page.tokenVersionBody.firstChild)
@@ -731,7 +868,7 @@ export default class WalletsPage extends BasePage {
Doc.hide(page.peerSpinner)
const res = await postJSON('/api/getwalletpeers', {
- assetID: this.selectedAssetID
+ assetID: this.selectedWalletID
})
if (!app().checkResponse(res)) {
page.managePeersErr.textContent = res.msg
@@ -783,7 +920,7 @@ export default class WalletsPage extends BasePage {
Doc.bind(removeIcon, 'click', async () => {
Doc.hide(page.managePeersErr)
const res = await postJSON('/api/removewalletpeer', {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
addr: peer.addr
})
if (!app().checkResponse(res)) {
@@ -814,7 +951,7 @@ export default class WalletsPage extends BasePage {
const page = this.page
Doc.hide(page.managePeersErr)
const res = await postJSON('/api/addwalletpeer', {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
addr: page.addPeerInput.value
})
if (!app().checkResponse(res)) {
@@ -860,11 +997,11 @@ export default class WalletsPage extends BasePage {
const page = this.page
Doc.hide(page.toggleWalletStatusErr)
- const asset = app().assets[this.selectedAssetID]
+ const asset = app().assets[this.selectedWalletID]
const disable = !asset.wallet.disabled
const url = '/api/togglewalletstatus'
const req = {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
disable: disable
}
@@ -881,7 +1018,7 @@ export default class WalletsPage extends BasePage {
let successMsg = intl.prep(intl.ID_WALLET_DISABLED_MSG, fmtParams)
if (!disable) successMsg = intl.prep(intl.ID_WALLET_ENABLED_MSG, fmtParams)
- this.assetUpdated(this.selectedAssetID, page.toggleWalletStatusConfirm, successMsg)
+ this.assetUpdated(this.selectedWalletID, page.toggleWalletStatusConfirm, successMsg)
}
/*
@@ -933,50 +1070,31 @@ export default class WalletsPage extends BasePage {
}
prepareTickerAssets () {
- const fiats = app().fiatRatesMap
- let [haveAllFiatRates, totalUSD] = [true, 0]
- const tickers: TickerAsset[] = []
- const getTickerAsset = (a: SupportedAsset, xcRate: number): TickerAsset => {
- const { symbol, token, unitInfo: { conventional: {conversionFactor: cFactor, unit: ticker } } } = a
- const normedTicker = ticker === 'WETH' ? 'ETH' : ticker === 'WBTC' ? 'BTC' : ticker
- const i = tickers.findIndex((ta: TickerAsset) => ta.ticker === ticker, tickers)
- if (i === -1) {
- const ta: TickerAsset = {
- ticker: normedTicker, cFactor, assets: [], lookup: {}, hasTokens: false,
- logoSymbol: symbol, bal: { avail: 0, immature: 0, locked: 0, total: 0 }, xcRate
- }
- tickers.push(ta)
- return ta
+ const tickerList: TickerAsset[] = []
+ const tickerMap: Record = {}
+
+ for (const a of Object.values(app().user.assets)) {
+ const normedTicker = normalizedTicker(a)
+ let ta = tickerMap[normedTicker]
+ if (ta) {
+ ta.addChainAsset(a)
+ continue
}
- const ta = tickers[i]
- if (!token) ta.logoSymbol = symbol // Prefer the native asset symbol for e.g, eth/weth
- return tickers[i]
- }
-
- for (const [assetID, a] of Object.entries(app().user.assets)) {
- const { symbol, wallet: w, info: token, unitInfo: { conventional: { conversionFactor, unit: ticker } } } = a
- const xcRate = fiats[Number(assetID)]
- const ta = getTickerAsset(a, xcRate)
- if (!w) continue
- const { balance: { available, locked, immature } } = w
- const totalBal = available + locked + immature
- if (xcRate) totalUSD += totalBal / conversionFactor * xcRate
- else haveAllFiatRates = false
- if (!ta.logoSymbol || !token) ta.logoSymbol = symbol
- ta.hasTokens = ta.hasTokens && Boolean(token)
- ta.bal.avail += available
- ta.bal.locked += locked
- ta.bal.immature += immature
- ta.bal.total += available + locked + immature
- const state: AssetState = { symbol, ticker, bal: w.balance, xcRate }
- ta.assets.push(state)
- ta.lookup[Number(assetID)] = state
- }
- tickers.sort((a: TickerAsset, b: TickerAsset) => {
- if (a.assets.length && !b.assets.length) return -1
- if (!a.assets.length && b.assets.length) return 1
- if (!a.assets.length && !b.assets.length) return a.ticker === 'DCR' ? -1 : 1
- const [aTotal, bTotal] = [a.bal.total, b.bal.total]
+ ta = new TickerAsset(a)
+ tickerList.push(ta)
+ tickerMap[normedTicker] = ta
+ }
+ this.tickerList = tickerList
+ this.tickerMap = tickerMap
+ }
+
+ sortTickers () {
+ const { page, tickerList, tickerButtons } = this
+ tickerList.sort((a: TickerAsset, b: TickerAsset) => {
+ if (a.hasWallets && !b.hasWallets) return -1
+ if (!a.hasWallets && b.hasWallets) return 1
+ if (!a.hasWallets && !b.hasWallets) return a.ticker === 'DCR' ? -1 : 1
+ const [aTotal, bTotal] = [a.total, b.total]
if (aTotal === 0 && bTotal === 0) return a.ticker.localeCompare(b.ticker)
else if (aTotal === 0) return 1
else if (aTotal === 0) return -1
@@ -985,227 +1103,297 @@ export default class WalletsPage extends BasePage {
if (!aFiat && bFiat) return 1
return bFiat * bTotal - aFiat * aTotal
})
- this.totalUSD = totalUSD
- this.haveAllFiatRates = haveAllFiatRates
- this.tickers = tickers
- }
-
- // sortAssetButtons displays supported assets, sorted. Returns first asset in the
- // list.
- sortAssetButtons (): SupportedAsset {
- const { page, tickers, totalUSD } = this
- // const fiats = app().fiatRatesMap
- // this.assetButtons = {}
- // Global balance always goes first.
+ Doc.empty(page.tickerBalsBox)
+ for (const { ticker } of tickerList) page.tickerBalsBox.appendChild(tickerButtons[ticker])
+ }
+
+ refreshBalances () {
+ const { balTracker, tickerList, tickerTemplates, updateTickerButtonTemplate } = this
+ for (const ta of tickerList) {
+ const { ticker, total, xcRate, cFactor } = ta
+ balTracker[ticker] = total / cFactor * xcRate
+ updateTickerButtonTemplate(ta, tickerTemplates[ticker])
+ }
+ }
+
+ setTickerButtons (): string {
+ const { page, tickerList } = this
Doc.empty(page.assetSelect)
page.assetSelect.appendChild(page.globalBalanceBox)
page.assetSelect.appendChild(page.tickerBalsBox)
Doc.empty(page.tickerBalsBox)
- for (const { ticker, bal, cFactor, xcRate, logoSymbol, assets } of tickers) {
+ for (const ta of tickerList) {
+ const { ticker, logoSymbol } = ta
const div = page.tickerBalTmpl.cloneNode(true) as PageElement
- page.tickerBalsBox.appendChild(div)
+ this.tickerButtons[ticker] = div
+ Doc.bind(div, 'click', () => this.setSelectedTicker(ticker))
const tmpl = Doc.parseTemplate(div)
+ this.tickerTemplates[ticker] = tmpl
tmpl.logo.src = Doc.logoPath(logoSymbol)
tmpl.ticker.textContent = ticker
- if (assets.length) {
- tmpl.bal.textContent = Doc.formatFourSigFigs(bal.total / cFactor)
- tmpl.fiatBal.textContent = Doc.formatFourSigFigs(bal.total / cFactor * xcRate, 2)
- } else {
- Doc.hide(tmpl.fiatBox)
- tmpl.logo.classList.add('greyscale', 'faded')
- tmpl.ticker.classList.add('grey')
+ }
+ this.sortTickers()
+ page.assetSelect.classList.remove('invisible')
+ return 'DCR'
+ }
+
+ updateTickerButtonTemplate (ta: TickerAsset, tmpl: Record) {
+ const { total, cFactor, hasWallets, xcRate } = ta
+ Doc.setVis(hasWallets && xcRate, tmpl.fiatBox)
+ if (hasWallets) {
+ tmpl.bal.textContent = Doc.formatFourSigFigs(total / cFactor)
+ tmpl.fiatBal.textContent = Doc.formatFourSigFigs(total / cFactor * xcRate, 2)
+ tmpl.logo.classList.remove('greyscale', 'faded')
+ tmpl.ticker.classList.remove('grey')
+ } else {
+ tmpl.logo.classList.add('greyscale', 'faded')
+ tmpl.ticker.classList.add('grey')
+ }
+ }
+
+ updateGlobalBalance () {
+ const totalUSD = Object.values(this.balTracker).reduce((total, fiatBal) => total + fiatBal, 0)
+ this.page.globalBalance.textContent = Doc.formatFourSigFigs(totalUSD, 2)
+ }
+
+ updateAssetBalance (assetID: number) {
+ const ticker = normalizedTicker(app().assets[assetID])
+ const ta = this.tickerMap[ticker]
+ const { total, xcRate, cFactor } = ta
+ this.balTracker[ticker] = total / cFactor * xcRate
+ this.updateTickerButtonTemplate(ta, this.tickerTemplates[ticker])
+ this.updateGlobalBalance()
+ }
+
+ async setSelectedTicker (ticker: string) {
+ const ta = this.selectedTicker = this.tickerMap[ticker]
+ this.selectedWalletID = ta.blockchainWallet()?.assetID ?? -1
+ const { page } = this
+ const { logoSymbol, name, isMultiNet, hasTokens } = ta
+ Doc.setText(page.walletDetailsBox, '[data-ticker]', ticker)
+ Doc.setText(page.walletDetailsBox, '[data-asset-name]', name)
+ Doc.setSrc(page.walletDetailsBox, '[data-logo]', Doc.logoPath(logoSymbol))
+ page.walletDetailsBox.classList.toggle('multinet', isMultiNet)
+ page.walletDetailsBox.classList.toggle('token', hasTokens)
+ for (const div of Array.from(page.docs.children) as PageElement[]) Doc.setVis(div.dataset.docTicker === ticker, div)
+ this.updateDisplayedTicker()
+
+ // const { assetSelect } = this.page
+ // for (const b of assetSelect.children) b.classList.remove('selected')
+ // // this.assetButtons[assetID].bttn.classList.add('selected')
+ // this.selectedWalletID = assetID
+ // this.page.hideMixTxsCheckbox.checked = true
+ // this.updateDisplayedAsset(assetID)
+ this.showAvailableMarkets()
+
+ // const a = this.showRecentActivity(assetID)
+ // const b = this.showTxHistory(assetID)
+ for (const p of [this.updateTicketBuyer(), this.updatePrivacy()]) await p
+ }
+
+ updateDisplayedTicker () {
+ const { page, selectedTicker: ta } = this
+ const chainWallet = ta.blockchainWallet()
+ Doc.setVis(chainWallet && !chainWallet.wallet, page.createWalletBox)
+ Doc.setVis(ta.hasWallets, page.sendReceiveBox)
+ const w = chainWallet?.wallet
+ Doc.setVis(w, page.walletConfig)
+
+ if (w) {
+ Doc.show(page.walletConfig)
+ page.blockchainClass.textContent = w.class
+ const walletDef = app().walletDefinition(w.assetID, w.type)
+ page.walletType.textContent = walletDef.tab
+ this.updateSyncAndPeers()
+ }
+
+ this.updateDisplayedTickerBalance()
+ this.updateFeeState()
+ }
+
+ updateDisplayedTickerBalance (): void {
+ const { page, selectedTicker: ta, balanceDetails: { balance, fiatBalance, fiatBalanceBox } } = this
+ const { ui, total, cFactor, xcRate } = ta
+ balance.textContent = Doc.formatFourSigFigs(total / cFactor)
+ Doc.setVis(xcRate, fiatBalanceBox)
+ if (xcRate) fiatBalance.textContent = Doc.formatFourSigFigs(total / cFactor * xcRate, 2)
+ const chainWallet = ta.blockchainWallet()
+ // Only show balance breakdown if this is multi-chain or if this is unichain
+ // and has a wallet
+ const showBalanceBreakdown = Boolean(chainWallet?.wallet) || ta.isMultiNet
+ Doc.setVis(showBalanceBreakdown, page.balanceBreakdownBox)
+ Doc.setVis(total > 0, page.send)
+ if (!showBalanceBreakdown) return
+
+ Doc.empty(page.balanceBreakdown)
+ for (const { assetID, chainName, chainLogo, bal: { available, locked, immature }, token } of ta.chainAssets) {
+ const { wallet: w } = app().assets[assetID]
+ const tr = Doc.clone(page.blockchainBalanceTmpl)
+ page.balanceBreakdown.appendChild(tr)
+ const tmpl = Doc.parseTemplate(tr)
+ tmpl.chainLogo.src = chainLogo
+ tmpl.chainName.textContent = chainName
+ const usable = w || token?.parentMade
+ if (usable) {
+ if (immature > 0) Doc.formatCoinValue((immature), ui)
+ if (locked > 0) Doc.formatCoinValue((locked), ui)
+ tmpl.avail.textContent = Doc.formatCoinValue(available, ui)
+ tmpl.allocation.textContent = String(total ? Math.round((available + locked + immature) / total * 100) : 0) + '%'
}
+ Doc.bind(tmpl.txsBttn, 'click', () => {
+ console.log("--show transactions", )
+ })
+ Doc.bind(tmpl.createWalletBttn, 'click', () => this.showNewWallet(assetID))
+
+ Doc.setVis(usable, tmpl.txsBttn)
+ Doc.setVis(!usable, tmpl.createWalletBttn)
}
- page.globalBalance.textContent = Doc.formatFourSigFigs(totalUSD, 2)
-
-
- // const sortedAssets = [...Object.values(app().assets)]
- // sortedAssets.sort((a: SupportedAsset, b: SupportedAsset) => {
- // if (a.wallet && !b.wallet) return -1
- // if (!a.wallet && b.wallet) return 1
- // if (!a.wallet && !b.wallet) return a.symbol === 'dcr' ? -1 : 1
- // const [aBal, bBal] = [a.wallet.balance, b.wallet.balance]
- // const [aTotal, bTotal] = [aBal.available + aBal.immature + aBal.locked, bBal.available + bBal.immature + bBal.locked]
- // if (aTotal === 0 && bTotal === 0) return a.symbol.localeCompare(b.symbol)
- // else if (aTotal === 0) return 1
- // else if (aTotal === 0) return -1
- // const [aFiat, bFiat] = [fiats[a.id], fiats[b.id]]
- // if (aFiat && !bFiat) return -1
- // if (!aFiat && bFiat) return 1
- // return bFiat * bTotal - aFiat * aTotal
- // })
- // for (const a of sortedAssets) {
- // const bttn = page.iconSelectTmpl.cloneNode(true) as HTMLElement
- // page.assetSelect.appendChild(bttn)
- // const tmpl = Doc.parseTemplate(bttn)
- // this.assetButtons[a.id] = { tmpl, bttn }
- // this.updateAssetButton(a.id)
- // Doc.bind(bttn, 'click', () => {
- // this.setSelectedAsset(a.id)
- // State.storeLocal(State.selectedAssetLK, String(a.id))
- // })
- // }
- // page.assetSelect.classList.remove('invisible')
- // return sortedAssets[0]
-
-
- }
-
- updateAssetButton (assetID: number) {
- const a = app().assets[assetID]
- const { bttn, tmpl } = this.assetButtons[assetID]
- Doc.hide(tmpl.fiatBox, tmpl.noWallet)
- bttn.classList.add('nowallet')
- tmpl.img.src ||= Doc.logoPath(a.symbol) // don't initiate GET if already set (e.g. update on some notification)
- const symbolParts = a.symbol.split('.')
- if (symbolParts.length === 2) {
- const parentSymbol = symbolParts[1]
- tmpl.parentImg.classList.remove('d-hide')
- tmpl.parentImg.src ||= Doc.logoPath(parentSymbol)
- }
- if (this.selectedAssetID === assetID) bttn.classList.add('selected')
- tmpl.name.textContent = a.name
- if (a.wallet) {
- bttn.classList.remove('nowallet')
- const { wallet: { balance: b }, unitInfo: ui } = a
- const totalBalance = b.available + b.locked + b.immature
- const [s, unit] = Doc.formatBestUnitsFourSigFigs(totalBalance, ui)
- tmpl.balance.textContent = s
- tmpl.unit.textContent = unit
- Doc.show(tmpl.balanceBox)
- const fiatRate = app().fiatRatesMap[a.id]
- if (fiatRate) {
- Doc.show(tmpl.fiatBox)
- tmpl.fiat.textContent = Doc.formatFourSigFigs(totalBalance / ui.conventional.conversionFactor * fiatRate)
+
+
+ // TODO: handle reserves deficit with a notification.
+ // if (bal.reservesDeficit > 0) addPrimaryBalance(intl.prep(intl.ID_RESERVES_DEFICIT), bal.reservesDeficit, intl.prep(intl.ID_RESERVES_DEFICIT_MSG))
+
+ // page.purchaserBal.textContent = Doc.formatFourSigFigs(bal.available / ui.conventional.conversionFactor)
+ // app().bindTooltips(page.balanceDetailBox)
+ }
+
+ updateSyncAndPeers () {
+ const { page, selectedWalletID: assetID } = this
+ const w = app().walletMap[assetID]
+ const { peerCount, syncProgress, syncStatus, encrypted, open: unlocked, running, disabled } = w
+
+ Doc.hide(page.txSyncBox, page.txFindingAddrs, page.txProgress)
+ if (running) {
+ page.peerCount.textContent = String(peerCount)
+ page.syncProgress.textContent = `${(syncProgress * 100).toFixed(1)}%`
+ page.syncHeight.textContent = String(syncStatus.blocks)
+ if (syncStatus.txs !== undefined) {
+ Doc.show(page.txSyncBox)
+ if (syncStatus.txs === 0 && syncStatus.blocks >= syncStatus.targetHeight) Doc.show(page.txFindingAddrs)
+ else {
+ Doc.show(page.txProgress)
+ const prog = syncStatus.txs / syncStatus.targetHeight
+ page.txProgress.textContent = `${(prog * 100).toFixed(1)}%`
+ }
}
- } else Doc.show(tmpl.noWallet)
- }
-
- async setSelectedAsset (assetID: number) {
- const { assetSelect } = this.page
- for (const b of assetSelect.children) b.classList.remove('selected')
- this.assetButtons[assetID].bttn.classList.add('selected')
- this.selectedAssetID = assetID
- this.page.hideMixTxsCheckbox.checked = true
- this.updateDisplayedAsset(assetID)
- this.showAvailableMarkets(assetID)
- const a = this.showRecentActivity(assetID)
- const b = this.showTxHistory(assetID)
- const c = this.updateTicketBuyer(assetID)
- const d = this.updatePrivacy(assetID)
- for (const p of [a, b, c, d]) await p
- }
-
- updateDisplayedAsset (assetID: number) {
- if (assetID !== this.selectedAssetID) return
- const { symbol, wallet, name, token, unitInfo } = app().assets[assetID]
- const { page, body } = this
- Doc.setText(body, '[data-asset-name]', name)
- Doc.setText(body, '[data-ticker]', unitInfo.conventional.unit)
- page.assetLogo.src = Doc.logoPath(symbol)
+ } else {
+ page.peerCount.textContent = '—'
+ page.syncProgress.textContent = '—'
+ page.syncHeight.textContent = '—'
+ }
+
Doc.hide(
- page.balanceBox, page.fiatBalanceBox, page.createWallet, page.walletDetails,
- page.sendReceive, page.connectBttnBox, page.statusLocked, page.statusReady,
- page.statusOff, page.unlockBttnBox, page.lockBttnBox, page.connectBttnBox,
- page.peerCountBox, page.syncProgressBox, page.statusDisabled, page.tokenInfoBox,
- page.needsProviderBox, page.feeStateBox, page.txSyncBox, page.txProgress,
- page.txFindingAddrs
+ page.statusReady, page.statusLocked, page.statusOff, page.statusDisabled, page.statusSyncing,
+ page.connectBttn, page.lockBttn, page.unlockBttn
)
- this.checkNeedsProvider(assetID)
- if (token) {
- const parentAsset = app().assets[token.parentID]
- page.tokenParentLogo.src = Doc.logoPath(parentAsset.symbol)
- page.tokenParentName.textContent = parentAsset.name
- Doc.show(page.tokenInfoBox)
- }
- if (wallet) {
- this.updateDisplayedAssetBalance()
- const { feeState, running, disabled, type: walletType } = wallet
- const walletDef = app().walletDefinition(assetID, walletType)
- page.walletType.textContent = walletDef.tab
- if (feeState) this.updateFeeState(feeState)
- if (disabled) Doc.show(page.statusDisabled) // wallet is disabled
- else if (running) {
- this.updateSyncAndPeers(wallet.assetID)
- } else Doc.show(page.statusOff, page.connectBttnBox) // wallet not running
- } else Doc.show(page.createWallet) // no wallet
-
- page.walletDetailsBox.classList.remove('invisible')
- }
-
- updateSyncAndPeers (assetID: number) {
- const { page, selectedAssetID } = this
- if (assetID !== selectedAssetID) return
- const { peerCount, syncProgress, syncStatus, encrypted, open, running } = app().walletMap[assetID]
- if (!running) return
- Doc.show(page.sendReceive, page.peerCountBox, page.syncProgressBox)
- page.peerCount.textContent = String(peerCount)
- page.syncProgress.textContent = `${(syncProgress * 100).toFixed(1)}%`
- if (open) {
- Doc.show(page.statusReady)
- if (!app().haveActiveOrders(assetID) && encrypted) Doc.show(page.lockBttnBox)
- } else Doc.show(page.statusLocked, page.unlockBttnBox) // wallet not unlocked
- Doc.setVis(syncStatus.txs !== undefined, page.txSyncBox)
- if (syncStatus.txs !== undefined) {
- Doc.hide(page.txProgress, page.txFindingAddrs)
- if (syncStatus.txs === 0 && syncStatus.blocks >= syncStatus.targetHeight) Doc.show(page.txFindingAddrs)
- else {
- Doc.show(page.txProgress)
- const prog = syncStatus.txs / syncStatus.targetHeight
- page.txProgress.textContent = `${(prog * 100).toFixed(1)}%`
+ if (disabled) return Doc.show(page.statusDisabled)
+ if (!running) return Doc.show(page.connectBttn, page.statusLocked)
+ const syncing = syncProgress < 1 || syncStatus.txs !== undefined
+ console.log("--updateSyncAndPeers", syncProgress, syncStatus)
+ if (syncing) return Doc.show(page.statusSyncing)
+ Doc.show(page.statusReady)
+ const hasActiveOrders = app().haveActiveOrders(assetID)
+ const lockable = unlocked && encrypted && !hasActiveOrders
+ const unlockable = encrypted && !unlocked
+ Doc.setVis(unlockable, page.unlockBttn)
+ Doc.setVis(lockable, page.lockBttn)
+ if (unlockable) Doc.show(page.unlockBttn)
+ else if (lockable) Doc.show(page.lockBttn)
+ }
+
+ updateFeeState () {
+ const { page, selectedTicker: ta } = this
+ const { ui, xcRate, chainAssets } = ta
+ console.log("--updateFeeState.0", { ticker: ta.ticker, ta })
+
+ page.feeStateXcRate.textContent = Doc.formatFourSigFigs(xcRate)
+
+ const formatUSD = (el: PageElement, v: number, feeUI: UnitInfo, feeFiatRate: number) => {
+ const tmpl = Doc.parseTemplate(el)
+ const fv = v / feeUI.conventional.conversionFactor * feeFiatRate
+ Doc.setVis(fv <= 0.001, tmpl.lessThan)
+ tmpl.value.textContent = Doc.formatFourSigFigs(Math.max(fv, 0.001), fv >= 0.1 ? 2 : 3)
+ }
+
+ const feeAssetStuff = (ca: ChainAsset): [number, UnitInfo, number] => {
+ const { assetID, token } = ca
+ const feeAssetID = token ? token.parentID : assetID
+ const feeUI = token?.feeUI ?? ui
+ const feeFiatRate = app().fiatRatesMap[feeAssetID]
+ return [feeAssetID, feeUI, feeFiatRate]
+ }
+
+ if (ta.isMultiNet) {
+ Doc.empty(page.netTxFees)
+ for (const ca of chainAssets) {
+ const { assetID, chainName, chainLogo } = ca
+ const [feeAssetID, feeUI, feeFiatRate] = feeAssetStuff(ca)
+ console.log("--updateFeeState", { assetID, feeAssetID, feeUI, feeFiatRate })
+ const tr = Doc.clone(page.netTxFeeTmpl)
+ page.netTxFees.appendChild(tr)
+ const tmpl = Doc.parseTemplate(tr)
+ tmpl.chainLogo.src = chainLogo
+ tmpl.chainName.textContent = chainName
+ const w = app().walletMap[assetID]
+ if (!w?.feeState) continue
+ // remove dummies
+ for (const dummy of Array.from(tr.children).slice(1)) tr.removeChild(dummy)
+ const { send, swap, redeem, rate } = w.feeState
+
+ const addTD = (v: number) => {
+ const td = Doc.clone(page.multiNetTxFeeTmpl)
+ tr.appendChild(td)
+ const tdTmpl = Doc.parseTemplate(td)
+ Doc.formatBestValueElement(tdTmpl.chainUnits, feeAssetID, v, feeUI)
+ formatUSD(tdTmpl.fiatUnits, v, feeUI, feeFiatRate)
+ }
+
+ addTD(send)
+ addTD(redeem) // buy
+ addTD(swap) // sell
+ // Rate
+ const td = Doc.clone(page.multiNetFeeRateTmpl)
+ tr.appendChild(td)
+ Doc.formatBestRateElement(td, feeAssetID, rate, feeUI)
}
+ app().bindUnits(page.netTxFees)
+ } else {
+ const [feeAssetID, feeUI, feeFiatRate] = feeAssetStuff(chainAssets[0])
+ const w = app().walletMap[feeAssetID]
+ if (!w?.feeState) {
+ Doc.hide(page.txFeesBox)
+ return
+ }
+ const { rate, send, swap, redeem } = w.feeState
+ Doc.formatBestRateElement(page.networkFeeRate, feeAssetID, rate, feeUI)
+ Doc.formatBestValueElement(page.feeStateSendFees, feeAssetID, send, feeUI)
+ Doc.formatBestValueElement(page.feeStateSellFees, feeAssetID, swap, feeUI)
+ Doc.formatBestValueElement(page.feeStateBuyFees, feeAssetID, redeem, feeUI)
+ formatUSD(page.feeStateSendFiat, send, feeUI, feeFiatRate)
+ formatUSD(page.feeStateSellFiat, swap, feeUI, feeFiatRate)
+ formatUSD(page.feeStateBuyFiat, redeem, feeUI, feeFiatRate)
}
+
}
- updateFeeState (feeState: FeeState) {
- const { page, selectedAssetID: assetID } = this
- Doc.hide(page.feeStateBox)
- const { unitInfo: ui, token } = app().assets[assetID]
- const fiatRate = app().fiatRatesMap[assetID]
- if (!fiatRate) return
- const feeAssetID = token ? token.parentID : assetID
- const feeFiatRate = app().fiatRatesMap[feeAssetID]
- if (token && !feeFiatRate) return
- Doc.show(page.feeStateBox)
- const feeUI = token ? app().assets[token.parentID].unitInfo : ui
- Doc.formatBestRateElement(page.feeStateNetRate, feeAssetID, feeState.rate, feeUI)
- Doc.formatBestValueElement(page.feeStateSendFees, feeAssetID, feeState.send, feeUI)
- Doc.formatBestValueElement(page.feeStateSwapFees, feeAssetID, feeState.swap, feeUI)
- Doc.formatBestValueElement(page.feeStateRedeemFees, feeAssetID, feeState.redeem, feeUI)
- page.feeStateXcRate.textContent = Doc.formatFourSigFigs(fiatRate)
- const sendFiat = feeState.send / feeUI.conventional.conversionFactor * feeFiatRate
- page.feeStateSendFiat.textContent = Doc.formatFourSigFigs(sendFiat)
- const swapFiat = feeState.swap / feeUI.conventional.conversionFactor * feeFiatRate
- page.feeStateSwapFiat.textContent = Doc.formatFourSigFigs(swapFiat)
- const redeemFiat = feeState.redeem / feeUI.conventional.conversionFactor * feeFiatRate
- page.feeStateRedeemFiat.textContent = Doc.formatFourSigFigs(redeemFiat)
- Doc.show(page.feeStateBox)
- }
-
- async checkNeedsProvider (assetID: number) {
- const needs = await app().needsCustomProvider(assetID)
- const { page: { needsProviderBox: box, needsProviderBttn: bttn } } = this
- Doc.setVis(needs, box)
- if (!needs) return
- Doc.blink(bttn)
- }
-
- async updateTicketBuyer (assetID: number) {
- this.ticketPage = {
- number: 0,
- history: [],
- scanned: false
- }
+ async updateTicketBuyer () {
+ const { page, selectedWalletID: assetID } = this
+ if (assetID === -1) return Doc.hide(page.stakingBox)
const { wallet, unitInfo: ui } = app().assets[assetID]
- const page = this.page
Doc.hide(
- page.stakingBox, page.pickVSP, page.stakingSummary, page.stakingErr,
+ page.pickVSP, page.stakingSummary, page.stakingErr,
page.vspDisplayBox, page.ticketPriceBox, page.purchaseTicketsBox,
page.stakingRpcSpvMsg, page.ticketsDisabled
)
- if (!wallet?.running || (wallet.traits & traitTicketBuyer) === 0) return
- Doc.show(page.stakingBox)
+ const showStakingBox = wallet?.running && Boolean(wallet.traits & traitTicketBuyer)
+ Doc.setVis(showStakingBox, page.stakingBox)
+ if (!showStakingBox) return
+ this.ticketPage = {
+ number: 0,
+ history: [],
+ scanned: false
+ }
const loaded = app().loading(page.stakingBox)
const res = await this.safePost('/api/stakestatus', assetID)
loaded()
@@ -1228,7 +1416,7 @@ export default class WalletsPage extends BasePage {
page.purchaserBal.textContent = Doc.formatCoinValue(wallet.balance.available, ui)
this.updateTicketStats(stakeStatus.stats, ui, stakeStatus.ticketPrice, stakeStatus.votingSubsidy)
// If this is an extension wallet, we'll might to disable all controls.
- const disableStaking = app().extensionWallet(this.selectedAssetID)?.disableStaking
+ const disableStaking = app().extensionWallet(this.selectedWalletID)?.disableStaking
if (disableStaking) {
Doc.hide(page.setVotes, page.showVSPs)
Doc.show(page.ticketsDisabled)
@@ -1272,7 +1460,7 @@ export default class WalletsPage extends BasePage {
}
async showVSPPicker () {
- const assetID = this.selectedAssetID
+ const assetID = this.selectedWalletID
const page = this.page
this.showForm(page.vspPicker)
Doc.empty(page.vspPickerList)
@@ -1319,7 +1507,7 @@ export default class WalletsPage extends BasePage {
}
async purchaseTickets () {
- const { page, selectedAssetID: assetID } = this
+ const { page, selectedWalletID: assetID } = this
// DRAFT NOTE: The user will get an actual ticket count somewhere in the
// range 1 <= tickets_purchased <= n. See notes in
// (*spvWallet).PurchaseTickets.
@@ -1340,10 +1528,10 @@ export default class WalletsPage extends BasePage {
}
processTicketPurchaseUpdate (walletNote: CustomWalletNote) {
- const { stakeStatus, selectedAssetID, page } = this
+ const { stakeStatus, selectedWalletID, page } = this
const { assetID } = walletNote
const { err, remaining, tickets, stats } = walletNote.payload as TicketPurchaseUpdate
- if (assetID !== selectedAssetID) return
+ if (assetID !== selectedWalletID) return
if (err) {
Doc.show(page.purchaseTicketsErrBox)
page.purchaseTicketsErr.textContent = err
@@ -1372,7 +1560,7 @@ export default class WalletsPage extends BasePage {
}
setCustomVSP () {
- const assetID = this.selectedAssetID
+ const assetID = this.selectedWalletID
const vsp = { url: this.page.customVspUrl.value } as VotingServiceProvider
this.setVSP(assetID, vsp)
}
@@ -1395,7 +1583,7 @@ export default class WalletsPage extends BasePage {
}
displayTicketPage (pageNumber: number, pageOfTickets: Ticket[]) {
- const { page, selectedAssetID: assetID } = this
+ const { page, selectedWalletID: assetID } = this
const ui = app().unitInfo(assetID)
const coinLink = CoinExplorers[assetID][app().user.net]
Doc.empty(page.ticketHistoryRows)
@@ -1415,7 +1603,7 @@ export default class WalletsPage extends BasePage {
}
async ticketPageN (pageNumber: number) {
- const { page, stakeStatus, ticketPage, selectedAssetID: assetID } = this
+ const { page, stakeStatus, ticketPage, selectedWalletID: assetID } = this
const pageOfTickets = this.pageOfTickets(pageNumber)
if (pageOfTickets.length < ticketPageSize && !ticketPage.scanned) {
const n = ticketPageSize - pageOfTickets.length
@@ -1467,7 +1655,7 @@ export default class WalletsPage extends BasePage {
}
showSetVotesDialog () {
- const { page, stakeStatus, selectedAssetID: assetID } = this
+ const { page, stakeStatus, selectedWalletID: assetID } = this
const ui = app().unitInfo(assetID)
Doc.hide(page.votingFormErr)
const coinLink = CoinExplorers[assetID][app().user.net]
@@ -1562,16 +1750,19 @@ export default class WalletsPage extends BasePage {
this.showForm(page.votingForm)
}
- async updatePrivacy (assetID: number) {
- const disablePrivacy = app().extensionWallet(assetID)?.disablePrivacy
+ async updatePrivacy () {
+ const { page, selectedWalletID: assetID } = this
this.mixing = false
- const { wallet } = app().assets[assetID]
- const page = this.page
- Doc.hide(page.mixingBox, page.mixerOff, page.mixerOn)
+ if (assetID === -1) return Doc.hide(page.mixingBox)
+ const disablePrivacy = app().extensionWallet(assetID)?.disablePrivacy
+ const { wallet: w } = app().assets[assetID]
+ const showMixingBox = !disablePrivacy && w?.running && Boolean(w.traits & traitFundsMixer)
+ Doc.setVis(showMixingBox, page.mixingBox)
+ if (!showMixingBox) return
+ Doc.hide(page.mixerOff, page.mixerOn)
// TODO: Show special messaging if the asset supports mixing but not this
// wallet type.
- if (disablePrivacy || !wallet?.running || (wallet.traits & traitFundsMixer) === 0) return
- Doc.show(page.mixingBox, page.mixerLoading)
+ Doc.show(page.mixerLoading)
const res = await this.safePost('/api/mixingstats', { assetID })
Doc.hide(page.mixerLoading)
if (!app().checkResponse(res)) {
@@ -1590,7 +1781,7 @@ export default class WalletsPage extends BasePage {
const page = this.page
Doc.hide(page.mixingErr)
const loaded = app().loading(page.mixingBox)
- const res = await postJSON('/api/configuremixer', { assetID: this.selectedAssetID, enabled: on })
+ const res = await postJSON('/api/configuremixer', { assetID: this.selectedWalletID, enabled: on })
loaded()
if (!app().checkResponse(res)) {
page.mixingErr.textContent = intl.prep(intl.ID_API_ERROR, { msg: res.msg })
@@ -1602,87 +1793,87 @@ export default class WalletsPage extends BasePage {
this.mixerToggle.setState(on)
}
- updateDisplayedAssetBalance (): void {
- const page = this.page
- const asset = app().assets[this.selectedAssetID]
- const { wallet, unitInfo: ui, id: assetID } = asset
- const bal = wallet.balance
- Doc.show(page.balanceBox, page.walletDetails)
- const totalLocked = bal.locked + bal.contractlocked + bal.bondlocked
- const totalBalance = bal.available + totalLocked + bal.immature
- page.balance.textContent = Doc.formatCoinValue(totalBalance, ui)
- page.balanceUnit.textContent = ui.conventional.unit
- const rate = app().fiatRatesMap[assetID]
- if (rate) {
- Doc.show(page.fiatBalanceBox)
- page.fiatBalance.textContent = Doc.formatFiatConversion(totalBalance, rate, ui)
- }
- Doc.empty(page.balanceDetailBox)
-
- const addBalanceRow = (cat: string, bal: number, tooltipMsg?: string) => {
- const row = page.balanceDetailRow.cloneNode(true) as PageElement
- page.balanceDetailBox.appendChild(row)
- const tmpl = Doc.parseTemplate(row)
- tmpl.name.textContent = cat
- if (tooltipMsg) {
- tmpl.tooltipMsg.dataset.tooltip = tooltipMsg
- Doc.show(tmpl.tooltipMsg)
- }
- tmpl.balance.textContent = Doc.formatCoinValue(bal, ui)
- return row
- }
-
- let lastSubLockedRow: PageElement | undefined
- let lastPrimaryRow: PageElement | undefined
- const addPrimaryBalance = (cat: string, bal: number, tooltipMsg?: string) => {
- lastSubLockedRow = undefined
- lastPrimaryRow = addBalanceRow(cat, bal, tooltipMsg)
- }
- const addSubBalance = (cat: string, bal: number, tooltipMsg?: string) => {
- lastSubLockedRow = addBalanceRow(cat, bal, tooltipMsg)
- lastSubLockedRow.classList.add('sub')
- }
- const setRowClasses = () => {
- if (!lastSubLockedRow) return
- (lastPrimaryRow as PageElement).classList.add('itemized')
- lastSubLockedRow.classList.add('last')
- }
-
- addPrimaryBalance(intl.prep(intl.ID_AVAILABLE_TITLE), bal.available, '')
- if (bal.other?.Shielded !== undefined) {
- const transparent = bal.available - bal.other.Shielded.amt
- addSubBalance(intl.prep(intl.ID_TRANSPARENT), transparent)
- addSubBalance(intl.prep(intl.ID_SHIELDED), bal.other.Shielded.amt)
- }
- setRowClasses()
-
- addPrimaryBalance(intl.prep(intl.ID_LOCKED_TITLE), totalLocked, intl.prep(intl.ID_LOCKED_BAL_MSG))
- if (bal.orderlocked > 0) addSubBalance(intl.prep(intl.ID_ORDER), bal.orderlocked, intl.prep(intl.ID_LOCKED_ORDER_BAL_MSG))
- if (bal.contractlocked > 0) addSubBalance(intl.prep(intl.ID_SWAPPING), bal.contractlocked, intl.prep(intl.ID_LOCKED_SWAPPING_BAL_MSG))
- if (bal.bondlocked > 0) addSubBalance(intl.prep(intl.ID_BONDED), bal.bondlocked, intl.prep(intl.ID_LOCKED_BOND_BAL_MSG))
- if (bal.bondReserves > 0) addSubBalance(intl.prep(intl.ID_BOND_RESERVES), bal.bondReserves, intl.prep(intl.ID_BOND_RESERVES_MSG))
- if (bal?.other?.Staked !== undefined) addSubBalance('Staked', bal.other.Staked.amt)
- setRowClasses()
-
- if (bal.immature) addPrimaryBalance(intl.prep(intl.ID_IMMATURE_TITLE), bal.immature, intl.prep(intl.ID_IMMATURE_BAL_MSG))
- if (bal?.other?.Unmixed !== undefined) addSubBalance('Unmixed', bal.other.Unmixed.amt)
- setRowClasses()
-
- // TODO: handle reserves deficit with a notification.
- // if (bal.reservesDeficit > 0) addPrimaryBalance(intl.prep(intl.ID_RESERVES_DEFICIT), bal.reservesDeficit, intl.prep(intl.ID_RESERVES_DEFICIT_MSG))
-
- page.purchaserBal.textContent = Doc.formatFourSigFigs(bal.available / ui.conventional.conversionFactor)
- app().bindTooltips(page.balanceDetailBox)
- }
-
- showAvailableMarkets (assetID: number) {
- const page = this.page
+ // updateDisplayedAssetBalance (): void {
+ // const page = this.page
+ // const asset = app().assets[this.selectedWalletID]
+ // const { wallet, unitInfo: ui, id: assetID } = asset
+ // const bal = wallet.balance
+ // Doc.show(page.balanceBox, page.walletDetails)
+ // const totalLocked = bal.locked + bal.contractlocked + bal.bondlocked
+ // const totalBalance = bal.available + totalLocked + bal.immature
+ // page.balance.textContent = Doc.formatCoinValue(totalBalance, ui)
+ // page.balanceUnit.textContent = ui.conventional.unit
+ // const rate = app().fiatRatesMap[assetID]
+ // if (rate) {
+ // Doc.show(page.fiatBalanceBox)
+ // page.fiatBalance.textContent = Doc.formatFiatConversion(totalBalance, rate, ui)
+ // }
+ // Doc.empty(page.balanceDetailBox)
+
+ // const addBalanceRow = (cat: string, bal: number, tooltipMsg?: string) => {
+ // const row = page.balanceDetailRow.cloneNode(true) as PageElement
+ // page.balanceDetailBox.appendChild(row)
+ // const tmpl = Doc.parseTemplate(row)
+ // tmpl.name.textContent = cat
+ // if (tooltipMsg) {
+ // tmpl.tooltipMsg.dataset.tooltip = tooltipMsg
+ // Doc.show(tmpl.tooltipMsg)
+ // }
+ // tmpl.balance.textContent = Doc.formatCoinValue(bal, ui)
+ // return row
+ // }
+
+ // let lastSubLockedRow: PageElement | undefined
+ // let lastPrimaryRow: PageElement | undefined
+ // const addPrimaryBalance = (cat: string, bal: number, tooltipMsg?: string) => {
+ // lastSubLockedRow = undefined
+ // lastPrimaryRow = addBalanceRow(cat, bal, tooltipMsg)
+ // }
+ // const addSubBalance = (cat: string, bal: number, tooltipMsg?: string) => {
+ // lastSubLockedRow = addBalanceRow(cat, bal, tooltipMsg)
+ // lastSubLockedRow.classList.add('sub')
+ // }
+ // const setRowClasses = () => {
+ // if (!lastSubLockedRow) return
+ // (lastPrimaryRow as PageElement).classList.add('itemized')
+ // lastSubLockedRow.classList.add('last')
+ // }
+
+ // addPrimaryBalance(intl.prep(intl.ID_AVAILABLE_TITLE), bal.available, '')
+ // if (bal.other?.Shielded !== undefined) {
+ // const transparent = bal.available - bal.other.Shielded.amt
+ // addSubBalance(intl.prep(intl.ID_TRANSPARENT), transparent)
+ // addSubBalance(intl.prep(intl.ID_SHIELDED), bal.other.Shielded.amt)
+ // }
+ // setRowClasses()
+
+ // addPrimaryBalance(intl.prep(intl.ID_LOCKED_TITLE), totalLocked, intl.prep(intl.ID_LOCKED_BAL_MSG))
+ // if (bal.orderlocked > 0) addSubBalance(intl.prep(intl.ID_ORDER), bal.orderlocked, intl.prep(intl.ID_LOCKED_ORDER_BAL_MSG))
+ // if (bal.contractlocked > 0) addSubBalance(intl.prep(intl.ID_SWAPPING), bal.contractlocked, intl.prep(intl.ID_LOCKED_SWAPPING_BAL_MSG))
+ // if (bal.bondlocked > 0) addSubBalance(intl.prep(intl.ID_BONDED), bal.bondlocked, intl.prep(intl.ID_LOCKED_BOND_BAL_MSG))
+ // if (bal.bondReserves > 0) addSubBalance(intl.prep(intl.ID_BOND_RESERVES), bal.bondReserves, intl.prep(intl.ID_BOND_RESERVES_MSG))
+ // if (bal?.other?.Staked !== undefined) addSubBalance('Staked', bal.other.Staked.amt)
+ // setRowClasses()
+
+ // if (bal.immature) addPrimaryBalance(intl.prep(intl.ID_IMMATURE_TITLE), bal.immature, intl.prep(intl.ID_IMMATURE_BAL_MSG))
+ // if (bal?.other?.Unmixed !== undefined) addSubBalance('Unmixed', bal.other.Unmixed.amt)
+ // setRowClasses()
+
+ // // TODO: handle reserves deficit with a notification.
+ // // if (bal.reservesDeficit > 0) addPrimaryBalance(intl.prep(intl.ID_RESERVES_DEFICIT), bal.reservesDeficit, intl.prep(intl.ID_RESERVES_DEFICIT_MSG))
+
+ // page.purchaserBal.textContent = Doc.formatFourSigFigs(bal.available / ui.conventional.conversionFactor)
+ // app().bindTooltips(page.balanceDetailBox)
+ // }
+
+ showAvailableMarkets () {
+ const { page, selectedTicker: { chainAssetLookup } } = this
const exchanges = app().user.exchanges
- const markets: [string, Exchange, Market][] = []
+ const markets: [string, Exchange, Market, ChainAsset][] = []
for (const xc of Object.values(exchanges)) {
- if (!xc.markets) continue
- for (const mkt of Object.values(xc.markets)) {
- if (mkt.baseid === assetID || mkt.quoteid === assetID) markets.push([xc.host, xc, mkt])
+ for (const mkt of Object.values(xc.markets ?? [])) {
+ if (chainAssetLookup[mkt.baseid]) markets.push([xc.host, xc, mkt, chainAssetLookup[mkt.baseid]])
+ else if (chainAssetLookup[mkt.quoteid]) markets.push([xc.host, xc, mkt, chainAssetLookup[mkt.quoteid]])
}
}
@@ -1694,15 +1885,15 @@ export default class WalletsPage extends BasePage {
return volume / conversionFactor
}
- markets.sort((a: [string, Exchange, Market], b: [string, Exchange, Market]): number => {
- const [hostA,, mktA] = a
- const [hostB,, mktB] = b
+ markets.sort((a: [string, Exchange, Market, ChainAsset], b: [string, Exchange, Market, ChainAsset]): number => {
+ const [hostA,, mktA, caA] = a
+ const [hostB,, mktB, caB] = b
if (!mktA.spot && !mktB.spot) return hostA.localeCompare(hostB)
- return spotVolume(assetID, mktB) - spotVolume(assetID, mktA)
+ return spotVolume(caA.assetID, mktB) - spotVolume(caB.assetID, mktA)
})
Doc.empty(page.availableMarkets)
- for (const [host, xc, mkt] of markets) {
+ for (const [host, xc, mkt, ca] of markets) {
const { spot, baseid, basesymbol, quoteid, quotesymbol } = mkt
const row = page.marketRow.cloneNode(true) as PageElement
page.availableMarkets.appendChild(row)
@@ -1720,8 +1911,8 @@ export default class WalletsPage extends BasePage {
const fmtSymbol = (s: string) => s.split('.')[0].toUpperCase()
tmpl.priceQuoteUnit.textContent = fmtSymbol(quotesymbol)
tmpl.priceBaseUnit.textContent = fmtSymbol(basesymbol)
- tmpl.volume.textContent = Doc.formatFourSigFigs(spotVolume(assetID, mkt))
- tmpl.volumeUnit.textContent = assetID === baseid ? fmtSymbol(basesymbol) : fmtSymbol(quotesymbol)
+ tmpl.volume.textContent = Doc.formatFourSigFigs(spotVolume(ca.assetID, mkt))
+ tmpl.volumeUnit.textContent = ca.assetID === baseid ? fmtSymbol(basesymbol) : fmtSymbol(quotesymbol)
} else Doc.hide(tmpl.priceBox, tmpl.volumeBox)
Doc.bind(row, 'click', () => app().loadPage('markets', { host, baseID: baseid, quoteID: quoteid }))
}
@@ -1844,14 +2035,14 @@ export default class WalletsPage extends BasePage {
const page = this.page
// Block explorer
- const assetExplorer = CoinExplorers[this.selectedAssetID]
+ const assetExplorer = CoinExplorers[this.selectedWalletID]
if (assetExplorer && assetExplorer[net]) {
page.txViewBlockExplorer.href = assetExplorer[net](tx.id)
}
// Tx type
let txType = txTypeString(tx.type)
- if (tx.tokenID && tx.tokenID !== this.selectedAssetID) {
+ if (tx.tokenID && tx.tokenID !== this.selectedWalletID) {
const tokenSymbol = app().assets[tx.tokenID].symbol.split('.')[0].toUpperCase()
txType = `${tokenSymbol} ${txType}`
}
@@ -1863,7 +2054,7 @@ export default class WalletsPage extends BasePage {
if (noAmtTxTypes.includes(tx.type)) {
Doc.hide(page.txDetailsAmtSection)
} else {
- let assetID = this.selectedAssetID
+ let assetID = this.selectedWalletID
if (tx.tokenID) assetID = tx.tokenID
Doc.show(page.txDetailsAmtSection)
const ui = app().unitInfo(assetID)
@@ -1874,7 +2065,7 @@ export default class WalletsPage extends BasePage {
}
// Fee
- let feeAsset = this.selectedAssetID
+ let feeAsset = this.selectedWalletID
if (tx.tokenID !== undefined) {
const asset = app().assets[tx.tokenID]
if (asset.token) {
@@ -1935,7 +2126,7 @@ export default class WalletsPage extends BasePage {
}
showTxDetailsPopup (id: string) {
- const tx = app().getWalletTx(this.selectedAssetID, id)
+ const tx = app().getWalletTx(this.selectedWalletID, id)
if (!tx) {
console.error(`wallet transaction ${id} not found`)
return
@@ -1961,7 +2152,7 @@ export default class WalletsPage extends BasePage {
}
handleTxNote (tx: WalletTransaction, newTx: boolean) {
- const w = app().assets[this.selectedAssetID].wallet
+ const w = app().assets[this.selectedWalletID].wallet
const hideMixing = (w.traits & traitFundsMixer) !== 0 && !!this.page.hideMixTxs.checked
if (hideMixing && tx.type === txTypeMixing) return
if (newTx) {
@@ -1969,20 +2160,20 @@ export default class WalletsPage extends BasePage {
Doc.show(this.page.txHistoryTable)
Doc.hide(this.page.noTxHistory)
this.page.txHistoryTableBody.appendChild(this.txHistoryDateRow(this.txDate(tx)))
- this.page.txHistoryTableBody.appendChild(this.txHistoryRow(tx, this.selectedAssetID))
+ this.page.txHistoryTableBody.appendChild(this.txHistoryRow(tx, this.selectedWalletID))
this.oldestTx = tx
} else if (this.txDate(tx) !== this.txHistoryTableNewestDate()) {
- this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedAssetID), this.page.txHistoryTableBody.children[0])
+ this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedWalletID), this.page.txHistoryTableBody.children[0])
this.page.txHistoryTableBody.insertBefore(this.txHistoryDateRow(this.txDate(tx)), this.page.txHistoryTableBody.children[0])
} else {
- this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedAssetID), this.page.txHistoryTableBody.children[1])
+ this.page.txHistoryTableBody.insertBefore(this.txHistoryRow(tx, this.selectedWalletID), this.page.txHistoryTableBody.children[1])
}
return
}
for (const row of this.page.txHistoryTableBody.children) {
const peRow = row as PageElement
if (peRow.dataset.txid === tx.id) {
- this.updateTxHistoryRow(peRow, tx, this.selectedAssetID)
+ this.updateTxHistoryRow(peRow, tx, this.selectedWalletID)
break
}
}
@@ -2022,7 +2213,7 @@ export default class WalletsPage extends BasePage {
async showTxHistory (assetID: number) {
const page = this.page
let txRes : TxHistoryResult
- Doc.hide(page.txHistoryTable, page.txHistoryBox, page.noTxHistory, page.earlierTxs, page.txHistoryNotAvailable, page.hideMixTxs)
+ Doc.hide(page.txHistoryTable, page.noTxHistory, page.earlierTxs, page.txHistoryNotAvailable, page.hideMixTxs)
Doc.empty(page.txHistoryTableBody)
const w = app().assets[assetID].wallet
if (!w || w.disabled || (w.traits & traitHistorian) === 0) {
@@ -2034,7 +2225,7 @@ export default class WalletsPage extends BasePage {
const isMixing = (w.traits & traitFundsMixer) !== 0
Doc.setVis(isMixing, page.hideMixTxs)
- Doc.show(page.txHistoryBox)
+ this.showForm(page.txHistoryForm)
try {
const hideMixing = isMixing && !!page.hideMixTxsCheckbox.checked
@@ -2068,10 +2259,10 @@ export default class WalletsPage extends BasePage {
if (!this.oldestTx) return
const page = this.page
let txRes : TxHistoryResult
- const w = app().assets[this.selectedAssetID].wallet
+ const w = app().assets[this.selectedWalletID].wallet
const hideMixing = (w.traits & traitFundsMixer) !== 0 && !!page.hideMixTxsCheckbox.checked
try {
- txRes = await this.getTxHistory(this.selectedAssetID, hideMixing, this.oldestTx.id)
+ txRes = await this.getTxHistory(this.selectedWalletID, hideMixing, this.oldestTx.id)
} catch (err) {
console.error(err)
return
@@ -2083,7 +2274,7 @@ export default class WalletsPage extends BasePage {
oldestDate = date
page.txHistoryTableBody.appendChild(this.txHistoryDateRow(date))
}
- const row = this.txHistoryRow(tx, this.selectedAssetID)
+ const row = this.txHistoryRow(tx, this.selectedWalletID)
page.txHistoryTableBody.appendChild(row)
}
Doc.setVis(!txRes.lastTx, page.earlierTxs)
@@ -2226,10 +2417,10 @@ export default class WalletsPage extends BasePage {
changeWalletType () {
const page = this.page
const walletType = page.changeWalletTypeSelect.value || ''
- const walletDef = app().walletDefinition(this.selectedAssetID, walletType)
- this.reconfigForm.update(this.selectedAssetID, walletDef.configopts || [], false)
- const wallet = app().walletMap[this.selectedAssetID]
- const currentDef = app().currentWalletDefinition(this.selectedAssetID)
+ const walletDef = app().walletDefinition(this.selectedWalletID, walletType)
+ this.reconfigForm.update(this.selectedWalletID, walletDef.configopts || [], false)
+ const wallet = app().walletMap[this.selectedWalletID]
+ const currentDef = app().currentWalletDefinition(this.selectedWalletID)
if (walletDef.type !== currentDef.type) this.setRecoverySupportMsgViz(false, wallet.symbol)
else this.showOrHideRecoverySupportMsg(wallet, walletDef.seeded)
this.setGuideLink(walletDef.guidelink)
@@ -2245,7 +2436,7 @@ export default class WalletsPage extends BasePage {
}
updateDisplayedReconfigFields (walletDef: WalletDefinition) {
- const disablePassword = app().extensionWallet(this.selectedAssetID)?.disablePassword
+ const disablePassword = app().extensionWallet(this.selectedWalletID)?.disablePassword
if (walletDef.seeded || walletDef.type === 'token' || disablePassword) {
Doc.hide(this.page.showChangePW, this.reconfigForm.fileSelector)
this.changeWalletPW = false
@@ -2254,14 +2445,33 @@ export default class WalletsPage extends BasePage {
}
/* Display a deposit address. */
- async showDeposit (assetID: number) {
- this.depositAddrForm.setAsset(assetID)
- this.showForm(this.page.deposit)
- }
-
- /* Show the form to either send or withdraw funds. */
- async showSendForm (assetID: number) {
- const page = this.page
+ async showDeposit () {
+ const { page, selectedTicker: { chainAssets } } = this
+ const assetIDs = chainAssets.map(({ assetID }: ChainAsset) => assetID)
+ this.depositAddrForm.setAssetSelect(assetIDs)
+ this.showForm(page.deposit)
+ }
+
+ async showSendForm () {
+ const { page, selectedTicker: { chainAssets } } = this
+ const fundedAssets: ChainAsset[] = []
+ for (const ca of chainAssets) if (ca.bal.available > 0) fundedAssets.push(ca)
+ if (fundedAssets.length === 1) return this.showSendAssetForm(fundedAssets[0].assetID)
+ Doc.empty(page.netSelectBox)
+ for (const { assetID, chainLogo, chainName, bal, ui } of chainAssets ) {
+ const bttn = Doc.clone(page.netSelectBttnTmpl)
+ page.netSelectBox.appendChild(bttn)
+ const tmpl = Doc.parseTemplate(bttn)
+ tmpl.logo.src = chainLogo
+ tmpl.chainName.textContent = chainName
+ tmpl.bal.textContent = Doc.formatCoinValue(bal.available, ui)
+ Doc.bind(bttn, 'click', () => {this.showSendAssetForm(assetID)})
+ }
+ this.showForm(page.sendChainSelectForm)
+ }
+
+ async showSendAssetForm (assetID: number) {
+ const { page } = this
const box = page.sendForm
const { wallet, unitInfo: ui, symbol, token } = app().assets[assetID]
Doc.hide(page.toggleSubtract)
@@ -2340,12 +2550,12 @@ export default class WalletsPage extends BasePage {
page.errorModalMsg.textContent = intl.prep(intl.ID_CONNECT_WALLET_ERR_MSG, { assetName: symbol, errMsg: res.msg })
this.showForm(page.errorModal)
}
- this.updateDisplayedAsset(assetID)
+ this.updateSyncAndPeers()
}
assetUpdated (assetID: number, oldForm?: PageElement, successMsg?: string) {
- if (assetID !== this.selectedAssetID) return
- this.updateDisplayedAsset(assetID)
+ if (this.selectedTicker.chainAssetLookup[assetID]) this.updateDisplayedTicker()
+ this.updateAssetBalance(assetID)
if (oldForm && Object.is(this.currentForm, oldForm)) {
if (successMsg) this.showSuccess(successMsg)
else this.closePopups()
@@ -2358,7 +2568,7 @@ export default class WalletsPage extends BasePage {
*/
async populateMaxSend () {
const page = this.page
- const { id: assetID, unitInfo: ui, wallet } = app().assets[this.selectedAssetID]
+ const { id: assetID, unitInfo: ui, wallet } = app().assets[this.selectedWalletID]
// Populate send amount with max send value and ensure we don't check
// subtract checkbox for assets that don't have a withdraw method.
const xcRate = app().fiatRatesMap[assetID]
@@ -2407,7 +2617,7 @@ export default class WalletsPage extends BasePage {
/* update wallet configuration */
async reconfig (): Promise {
const page = this.page
- const assetID = this.selectedAssetID
+ const assetID = this.selectedWalletID
Doc.hide(page.reconfigErr)
let walletType = app().currentWalletDefinition(assetID).type
if (!Doc.isHidden(page.changeWalletType)) {
@@ -2433,11 +2643,10 @@ export default class WalletsPage extends BasePage {
return
}
this.assetUpdated(assetID, page.reconfigForm, intl.prep(intl.ID_RECONFIG_SUCCESS))
- this.updateTicketBuyer(assetID)
+ this.updateTicketBuyer()
app().clearTxHistory(assetID)
- this.showTxHistory(assetID)
- this.updatePrivacy(assetID)
- this.checkNeedsProvider(assetID)
+ // this.showTxHistory(assetID)
+ this.updatePrivacy()
}
/* lock instructs the API to lock the wallet. */
@@ -2447,13 +2656,13 @@ export default class WalletsPage extends BasePage {
const res = await postJSON('/api/closewallet', { assetID: assetID })
loaded()
if (!app().checkResponse(res)) return
- this.updateDisplayedAsset(assetID)
- this.updatePrivacy(assetID)
+ this.updateSyncAndPeers()
+ this.updatePrivacy()
}
async downloadLogs (): Promise {
const search = new URLSearchParams('')
- search.append('assetid', `${this.selectedAssetID}`)
+ search.append('assetid', `${this.selectedWalletID}`)
const url = new URL(window.location.href)
url.search = search.toString()
url.pathname = '/wallets/logfile'
@@ -2475,7 +2684,7 @@ export default class WalletsPage extends BasePage {
async exportWalletAuthSubmit (): Promise {
const page = this.page
const req = {
- assetID: this.selectedAssetID,
+ assetID: this.selectedWalletID,
pass: page.exportWalletPW.value
}
const url = '/api/restorewalletinfo'
@@ -2511,7 +2720,7 @@ export default class WalletsPage extends BasePage {
const page = this.page
Doc.hide(page.recoverWalletErr)
const req = {
- assetID: this.selectedAssetID
+ assetID: this.selectedWalletID
}
const url = '/api/recoverwallet'
const loaded = app().loading(page.forms)
@@ -2549,19 +2758,18 @@ export default class WalletsPage extends BasePage {
value in default fiat rate.
. */
handleBalanceNote (note: BalanceNote): void {
- this.updateAssetButton(note.assetID)
- if (note.assetID === this.selectedAssetID) this.updateDisplayedAssetBalance()
+ this.updateAssetBalance(note.assetID)
+ if (this.selectedTicker.chainAssetLookup[note.assetID]) this.updateDisplayedTickerBalance()
}
/* handleRatesNote handles fiat rate notifications, updating the fiat value of
* all supported assets.
*/
- handleRatesNote (note: RateNote): void {
- this.updateAssetButton(this.selectedAssetID)
- if (!note.fiatRates[this.selectedAssetID]) return
- this.updateDisplayedAssetBalance()
- const { feeState } = app().walletMap[this.selectedAssetID]
- if (feeState) this.updateFeeState(feeState)
+ handleRatesNote (): void {
+ this.updateDisplayedTickerBalance()
+ this.updateFeeState()
+ this.refreshBalances()
+ this.updateGlobalBalance()
}
/*
@@ -2569,24 +2777,21 @@ export default class WalletsPage extends BasePage {
* 'walletconfig' notifications.
*/
handleWalletStateNote (note: WalletStateNote): void {
- const { assetID, feeState } = note.wallet
- this.updateAssetButton(assetID)
- this.assetUpdated(assetID)
+ const { assetID } = note.wallet
+ if (this.selectedTicker.chainAssetLookup[assetID]) this.updateDisplayedTicker()
+ if (assetID === this.selectedWalletID) this.updateFeeState()
if (note.topic === 'WalletPeersUpdate' &&
- assetID === this.selectedAssetID &&
+ assetID === this.selectedWalletID &&
Doc.isDisplayed(this.page.managePeersForm)) {
this.updateWalletPeersTable()
}
- if (feeState && assetID === this.selectedAssetID) this.updateFeeState(feeState)
}
/*
* handleCreateWalletNote is a handler for 'createwallet' notifications.
*/
handleCreateWalletNote (note: WalletCreationNote) {
- this.updateAssetButton(note.assetID)
- this.assetUpdated(note.assetID)
- this.showTxHistory(note.assetID)
+ if (this.selectedTicker.chainAssetLookup[note.assetID]) this.updateDisplayedTicker()
}
handleCustomWalletNote (note: WalletNote) {
@@ -2613,12 +2818,12 @@ export default class WalletsPage extends BasePage {
}
case 'transaction': {
const n = walletNote as TransactionNote
- if (n.assetID === this.selectedAssetID) this.handleTxNote(n.transaction, n.new)
+ if (n.assetID === this.selectedWalletID) this.handleTxNote(n.transaction, n.new)
break
}
case 'transactionHistorySynced' : {
const n = walletNote
- if (n.assetID === this.selectedAssetID) this.showTxHistory(n.assetID)
+ if (n.assetID === this.selectedWalletID) this.showTxHistory(n.assetID)
break
}
}
@@ -2638,3 +2843,8 @@ function trimStringWithEllipsis (str: string, maxLen: number): string {
if (str.length <= maxLen) return str
return `${str.substring(0, maxLen / 2)}...${str.substring(str.length - maxLen / 2)}`
}
+
+function normalizedTicker (a: SupportedAsset): string {
+ const ticker = a.unitInfo.conventional.unit
+ return ticker === 'WETH' ? 'ETH' : ticker === 'WBTC' ? 'BTC' : ticker
+}
\ No newline at end of file
diff --git a/client/webserver/types.go b/client/webserver/types.go
index f5b8e48be4..6125d5d656 100644
--- a/client/webserver/types.go
+++ b/client/webserver/types.go
@@ -87,9 +87,8 @@ type walletConfig struct {
// newWalletForm is information necessary to create a new wallet.
type newWalletForm struct {
walletConfig
- Pass encode.PassBytes `json:"pass"`
- AppPW encode.PassBytes `json:"appPass"`
- ParentForm *walletConfig `json:"parentForm"`
+ Pass encode.PassBytes `json:"pass"`
+ AppPW encode.PassBytes `json:"appPass"`
}
// openWalletForm is information necessary to open a wallet.
diff --git a/client/webserver/webserver.go b/client/webserver/webserver.go
index eac1bb6b51..91691aeb22 100644
--- a/client/webserver/webserver.go
+++ b/client/webserver/webserver.go
@@ -653,7 +653,7 @@ func (s *WebServer) buildTemplates(lang string) error {
addTemplate("login", bb, "forms").
addTemplate("register", bb, "forms").
addTemplate("markets", bb, "forms").
- addTemplate("wallets", bb, "forms").
+ addTemplate("wallets", bb, "forms", "docs").
addTemplate("settings", bb, "forms").
addTemplate("orders", bb).
addTemplate("order", bb, "forms").
diff --git a/dex/testing/loadbot/mantle.go b/dex/testing/loadbot/mantle.go
index 0e388d355d..5917c53369 100644
--- a/dex/testing/loadbot/mantle.go
+++ b/dex/testing/loadbot/mantle.go
@@ -521,15 +521,6 @@ func (m *Mantle) createWallet(symbol string, minFunds, maxFunds uint64, numCoins
}
var err error
- if w.parentForm != nil {
- // Create the parent asset
- if w.parentAddress, err = createWallet(walletPass, w.parentForm, 1); err != nil {
- m.fatalError("error creating parent asset wallet: %v", err)
- return
- }
- walletPass = nil
- }
-
if w.address, err = createWallet(walletPass, w.form, numCoins); err != nil {
m.fatalError(err.Error())
return
@@ -730,7 +721,6 @@ func randomToken() string {
// keep the Core wallet's balance within allowable range.
type botWallet struct {
form *core.WalletForm
- parentForm *core.WalletForm
minFunds uint64
maxFunds uint64
name string
@@ -749,7 +739,7 @@ type botWallet struct {
// Set numCoins to at least twice the the maximum number of (booked + epoch)
// orders the wallet is expected to support.
func newBotWallet(symbol, node, name string, port string, pass []byte, minFunds, maxFunds uint64, numCoins int) *botWallet {
- var form, parentForm *core.WalletForm
+ var form *core.WalletForm
switch symbol {
case dcr:
form = &core.WalletForm{
@@ -875,14 +865,6 @@ func newBotWallet(symbol, node, name string, port string, pass []byte, minFunds,
"providers": rpcProvider,
},
}
- if symbol == usdc {
- parentForm = form
- form = &core.WalletForm{
- Type: "token",
- AssetID: usdcID,
- ParentForm: form,
- }
- }
case polygon, usdcp:
rpcProvider := filepath.Join(dextestDir, "polygon", "alpha", "bor", "bor.ipc")
if node == beta {
@@ -895,26 +877,17 @@ func newBotWallet(symbol, node, name string, port string, pass []byte, minFunds,
"providers": rpcProvider,
},
}
- if symbol == usdcp {
- parentForm = form
- form = &core.WalletForm{
- Type: "token",
- AssetID: usdcpID,
- ParentForm: form,
- }
- }
}
return &botWallet{
- form: form,
- parentForm: parentForm,
- name: name,
- node: node,
- symbol: symbol,
- pass: pass,
- assetID: form.AssetID,
- numCoins: numCoins,
- minFunds: minFunds,
- maxFunds: maxFunds,
+ form: form,
+ name: name,
+ node: node,
+ symbol: symbol,
+ pass: pass,
+ assetID: form.AssetID,
+ numCoins: numCoins,
+ minFunds: minFunds,
+ maxFunds: maxFunds,
}
}
diff --git a/server/cmd/dexadm/main.go b/server/cmd/dexadm/main.go
index 5fbe2616f3..3648365833 100644
--- a/server/cmd/dexadm/main.go
+++ b/server/cmd/dexadm/main.go
@@ -221,7 +221,7 @@ func configure() (*Config, error) {
}
if cfg.AdminSrvCertPath == "" {
- return nil, fmt.Errorf("no adminsrvaddr argument in file or by command-line")
+ return nil, fmt.Errorf("no adminsrvcertpath argument in file or by command-line")
}
if cfg.AdminSrvPassword == "" {
[[[asset_name tx_history]]]
- - - - -
-
-
-
- [[[load_earlier_transactions]]]
-
- | [[[Type]]] | -[[[ID]]] | -[[[Age]]] | -[[[Fees]]] | -[[[Amount]]] | -
|---|---|---|---|---|
| - - | -- - | -
-
- [[[Mempool]]]
- |
- - - | -- - | -
| - - | -||||
- [[[no_tx_history]]]
+
+ {{- /* EXCHANGE RATE */ -}}
+
+
@@ -536,6 +588,21 @@
{{template "newWalletForm"}}
+ {{- /* SEND CHAIN SELECTION */ -}}
+
+
{{- /* SEND */ -}}
{{template "bottom"}}
diff --git a/client/webserver/site/src/js/app.ts b/client/webserver/site/src/js/app.ts
index 23002f9df5..4aa7ce153a 100644
--- a/client/webserver/site/src/js/app.ts
+++ b/client/webserver/site/src/js/app.ts
@@ -182,6 +182,10 @@ export default class Application {
txHistoryMap: RecordExchange Rate
+
+
+ $
+