@@ -99,13 +102,18 @@
Nothing found
- We couldn't find the validators you are looking for. Try searching by Index, Public Key or ETH address.
+ We couldn't find the validators you are looking for. Try searching by index, public key, deposit / withdrawal address or withdrawal
+ credential.
Add Validators
- You can add your validators by searching for a public key, validator index or your ETH address.
+
+ You can add your validators by searching for a public key, validator index, your deposit / withdrawal address or withdrawal credential.
+
diff --git a/src/app/tab-validators/tab-validators.page.scss b/src/app/tab-validators/tab-validators.page.scss
index f59a2834..62aecf8c 100644
--- a/src/app/tab-validators/tab-validators.page.scss
+++ b/src/app/tab-validators/tab-validators.page.scss
@@ -93,3 +93,10 @@ cdk-virtual-scroll-viewport {
margin-top: 55px;
margin-bottom: 10px;
}
+
+.hidden {
+ height: 0;
+ width: 0;
+ overflow: hidden;
+ visibility: hidden;
+}
diff --git a/src/app/tab-validators/tab-validators.page.ts b/src/app/tab-validators/tab-validators.page.ts
index 38b9dd20..b14223b2 100644
--- a/src/app/tab-validators/tab-validators.page.ts
+++ b/src/app/tab-validators/tab-validators.page.ts
@@ -18,9 +18,9 @@
* // along with Beaconchain Dashboard. If not, see .
*/
-import { Component } from '@angular/core'
+import { Component, ViewChild } from '@angular/core'
import { ValidatorUtils, Validator, ValidatorState } from '../utils/ValidatorUtils'
-import { ModalController, Platform } from '@ionic/angular'
+import { IonSearchbar, ModalController, Platform } from '@ionic/angular'
import { ValidatordetailPage } from '../pages/validatordetail/validatordetail.page'
import { ApiService } from '../services/api.service'
import { AlertController } from '@ionic/angular'
@@ -67,6 +67,8 @@ export class Tab2Page {
selected = new Map()
+ @ViewChild('searchbarRef', { static: true }) searchbarRef: IonSearchbar
+
constructor(
private validatorUtils: ValidatorUtils,
public modalController: ModalController,
@@ -81,6 +83,10 @@ export class Tab2Page {
public unit: UnitconvService
) {
this.validatorUtils.registerListener(() => {
+ if (this.searchResultMode && this.searchbarRef) {
+ this.searchResultMode = false
+ this.searchbarRef.value = null
+ }
this.refresh()
})
this.merchant.getCurrentPlanMaxValidator().then((result) => {
@@ -101,7 +107,7 @@ export class Tab2Page {
if (!this.searchResultMode) {
this.dataSource.setLoadFrom(this.getDefaultDataRetriever())
}
- this.dataSource.reset()
+ await this.dataSource.reset()
}
async syncRemote() {
@@ -189,13 +195,13 @@ export class Tab2Page {
}
}
- async removeAllDialog() {
+ removeAllDialog() {
this.showDialog('Remove all', 'Do you want to remove {AMOUNT} validators from your dashboard?', () => {
this.confirmRemoveAll()
})
}
- async addAllDialog() {
+ addAllDialog() {
this.showDialog('Add all', 'Do you want to add {AMOUNT} validators to your dashboard?', () => {
this.confirmAddAll()
})
@@ -223,18 +229,18 @@ export class Tab2Page {
}
async confirmRemoveAll() {
- this.validatorUtils.deleteAll()
- this.dataSource.reset()
+ await this.validatorUtils.deleteAll()
+ await this.dataSource.reset()
}
async confirmAddAll() {
const responses: ValidatorResponse[] = []
- this.dataSource.getItems().forEach(async (item) => {
+ this.dataSource.getItems().forEach((item) => {
responses.push(item.data)
})
- this.validatorUtils.convertToValidatorModelsAndSaveLocal(false, responses)
- this.dataSource.reset()
+ await this.validatorUtils.convertToValidatorModelsAndSaveLocal(false, responses)
+ await this.dataSource.reset()
}
searchEvent(event) {
@@ -250,8 +256,9 @@ export class Tab2Page {
this.searchResultMode = true
this.loading = true
const isETH1Address = searchString.startsWith('0x') && searchString.length == 42
+ const isWithdrawalCredential = searchString.startsWith('0x') && searchString.length == 66
- if (isETH1Address) await this.searchETH1(searchString)
+ if (isETH1Address || isWithdrawalCredential) await this.searchETH1(searchString)
else await this.searchByPubKeyOrIndex(searchString)
// this.loading = false would be preferable here but somehow the first time it is called the promises resolve instantly without waiting
@@ -278,12 +285,12 @@ export class Tab2Page {
private async searchETH1(target) {
this.dataSource.setLoadFrom(() => {
return this.validatorUtils
- .searchValidatorsViaETH1(target)
+ .searchValidatorsViaETHAddress(target)
.catch(async (error) => {
if (error && error.message && error.message.indexOf('only a maximum of') > 0) {
console.log('SET reachedMaxValidators to true')
this.reachedMaxValidators = true
- return this.validatorUtils.searchValidatorsViaETH1(target, this.currentPackageMaxValidators - 1)
+ return this.validatorUtils.searchValidatorsViaETHAddress(target, this.currentPackageMaxValidators - 1)
}
return []
})
@@ -478,7 +485,7 @@ export class Tab2Page {
buttons: [
{
text: 'Remove',
- handler: async () => {
+ handler: () => {
this.validatorUtils.saveRocketpoolCollateralShare(onlyOneNodeAddress.rocketpool.node_address, null)
this.cancelSelect()
this.validatorUtils.notifyListeners()
@@ -486,7 +493,7 @@ export class Tab2Page {
},
{
text: 'Save',
- handler: async (alertData) => {
+ handler: (alertData) => {
const shares = alertData.share
if (shares < minShareStake) {
Toast.show({
@@ -546,7 +553,9 @@ export class Tab2Page {
cssClass: 'my-custom-class',
header: 'Define stake share',
message:
- 'If you own partial amounts of these validators, specify the amount of ether for a custom dashboard. First value defines your consensus share, second value your execution share.',
+ 'If you own partial amounts of these validators, specify the amount of ' +
+ this.api.getCurrenciesFormatted() +
+ ' for a custom dashboard. First value defines your consensus share, second value your execution share.',
inputs: [
{
name: 'share',
@@ -564,7 +573,7 @@ export class Tab2Page {
buttons: [
{
text: 'Remove',
- handler: async () => {
+ handler: () => {
for (let i = 0; i < validatorSubArray.length; i++) {
validatorSubArray[i].share = null
validatorSubArray[i].execshare = null
@@ -576,7 +585,7 @@ export class Tab2Page {
},
{
text: 'Save',
- handler: async (alertData) => {
+ handler: (alertData) => {
const shares = alertData.share
const sharesEL = alertData.execshare
if ((shares && shares < minShareStake) || (sharesEL && sharesEL < minShareStake)) {
@@ -616,14 +625,4 @@ export class Tab2Page {
await alert.present()
}
-
- switchCurrencyPipe() {
- if (this.unit.pref == 'ETHER') {
- if (UnitconvService.currencyPipe == null) return
- this.unit.pref = UnitconvService.currencyPipe
- } else {
- UnitconvService.currencyPipe = this.unit.pref
- this.unit.pref = 'ETHER'
- }
- }
}
diff --git a/src/app/tabs/tabs.page.ts b/src/app/tabs/tabs.page.ts
index 6364815f..9dd73da5 100644
--- a/src/app/tabs/tabs.page.ts
+++ b/src/app/tabs/tabs.page.ts
@@ -80,7 +80,7 @@ export class TabsPage {
}
const hasTheming = await this.merchant.hasPremiumTheming()
- if (!hasTheming) {
+ if (!hasTheming && this.theme.currentThemeColor != 'gnosis') {
this.theme.resetTheming()
}
}
diff --git a/src/app/utils/BlockUtils.ts b/src/app/utils/BlockUtils.ts
index e577e73d..00ea5d0b 100644
--- a/src/app/utils/BlockUtils.ts
+++ b/src/app/utils/BlockUtils.ts
@@ -21,7 +21,6 @@
import { ApiService } from '../services/api.service'
import { Injectable } from '@angular/core'
import { BlockProducedByRequest, BlockResponse, DashboardRequest } from '../requests/requests'
-import { CacheModule } from './CacheModule'
import BigNumber from 'bignumber.js'
import { ValidatorUtils } from './ValidatorUtils'
@@ -33,10 +32,8 @@ const MONTH = 60 * 60 * 24 * 30
@Injectable({
providedIn: 'root',
})
-export class BlockUtils extends CacheModule {
- constructor(public api: ApiService, public validatorUtils: ValidatorUtils) {
- super()
- }
+export class BlockUtils {
+ constructor(public api: ApiService, public validatorUtils: ValidatorUtils) {}
async getBlockRewardWithShare(block: BlockResponse): Promise {
const proposer = block.posConsensus.proposerIndex
@@ -85,7 +82,7 @@ export class BlockUtils extends CacheModule {
luckPercentage: proposalLuckStats.proposal_luck,
timeFrameName: proposalLuckStats.time_frame_name,
userValidators: valis.length,
- expectedBlocksPerMonth: MONTH / (proposalLuckStats.average_proposal_interval * 12),
+ expectedBlocksPerMonth: MONTH / (proposalLuckStats.average_proposal_interval * this.api.getNetwork().slotsTime),
nextBlockEstimate: proposalLuckStats.next_proposal_estimate_ts * 1000,
} as Luck
}
diff --git a/src/app/utils/CacheModule.ts b/src/app/utils/CacheModule.ts
index cdc16266..bdb96c32 100644
--- a/src/app/utils/CacheModule.ts
+++ b/src/app/utils/CacheModule.ts
@@ -18,9 +18,11 @@
* // along with Beaconchain Dashboard. If not, see .
*/
-import { StorageService } from '../services/storage.service'
+import { StorageService, replacer } from '../services/storage.service'
import { Validator } from './ValidatorUtils'
+const LOGTAG = '[CacheModule]'
+
interface CachedData {
maxStaleTime: number
time: number
@@ -32,42 +34,93 @@ export class CacheModule {
private keyPrefix = ''
private hardStorage: StorageService = null
- initialized: Promise>
+ protected initialized: Promise
+
+ private cache: Map = new Map()
+ private hotOnly: Map = new Map()
+
+ private hardStorageSizeLimit: number
- constructor(keyPrefix = '', staleTime = 6 * 60 * 1000, hardStorage: StorageService = null) {
+ constructor(
+ keyPrefix = '',
+ staleTime = 6 * 60 * 1000,
+ hardStorage: StorageService = null,
+ hardStorageSizeLimit: number = 1000,
+ callInit: boolean = true
+ ) {
this.keyPrefix = keyPrefix
this.staleTime = staleTime
this.hardStorage = hardStorage
- this.init()
+ this.hardStorageSizeLimit = hardStorageSizeLimit
+ if (callInit) this.init()
}
- private async init() {
+ protected async init() {
if (this.hardStorage) {
- this.hardStorage.setObject('cachemodule_' + this.keyPrefix, null)
- this.initialized = this.hardStorage.getObject('cachemodule2_' + this.keyPrefix) as Promise>
- const result = await this.initialized
+ this.hardStorage.setObject('cachemodule_' + this.keyPrefix, null, false)
+ await this.initHardCache()
+ this.initialized = Promise.resolve()
+ } else {
+ this.initialized = Promise.resolve()
+ }
+ }
+
+ private async initHardCache() {
+ // dont load hardStorage if last time it was written too is more than 6 hours ago
+ const lastWrite = (await this.hardStorage.getObject('cachemodule2_' + this.keyPrefix + '_lastWrite')) as number
+ if (lastWrite && lastWrite + 6 * 60 * 60 * 1000 < this.getTimestamp()) {
+ console.log(LOGTAG + ' hardStorage too old, ignoring')
+ } else {
+ const result = (await this.hardStorage.getObject('cachemodule2_' + this.keyPrefix)) as Map
if (result) {
this.cache = result
}
- console.log('[CacheModule] initialized with ', this.cache)
- } else {
- this.initialized = new Promise>((resolve) => {
- resolve(new Map())
- })
- await this.initialized
+ this.checkHardCacheSize()
}
}
- private cache: Map = new Map()
- private hotOnly: Map = new Map()
+ private async checkHardCacheSize() {
+ try {
+ let kiloBytes = null
+ if (this.hardStorage) {
+ const size = new TextEncoder().encode(JSON.stringify(this.cache, replacer)).length
+ kiloBytes = Math.round((size * 100) / 1024) / 100
+ }
+ console.log(LOGTAG + ' initialized with ', kiloBytes == null ? '(unknown size)' : '(' + kiloBytes + ' KiB)', this.cache)
+ if (kiloBytes && kiloBytes > this.hardStorageSizeLimit) {
+ console.warn(LOGTAG + ' storage cap exceeded (1 MB), clearing cache')
+ await this.clearHardCache()
+ }
+ } catch (e) {
+ console.warn('could not calculate cache size')
+ }
+ }
private getStoreForCacheKey(cacheKey: string): Map {
// rationale: don't store big data objects in hardStorage due to severe performance impacts
- const storeHard = cacheKey.indexOf('app/dashboard') >= 0
+ const storeHard =
+ cacheKey.indexOf('app/dashboard') >= 0 ||
+ cacheKey.indexOf('produced?offset=0') >= 0 || // first page of blocks page
+ (cacheKey.indexOf('beaconcha.in') < 0 && cacheKey.indexOf('gnosischa.in') < 0 && cacheKey.indexOf('ads.bitfly') < 0)
return storeHard ? this.cache : this.hotOnly
}
- protected putCache(key: string, data: unknown, staleTime = this.staleTime) {
+ public async deleteAllHardStorageCacheKeyContains(search: string) {
+ if (!this.hardStorage) {
+ return
+ }
+ search = search.toLocaleLowerCase()
+ const keys = Array.from(this.cache.keys())
+ for (let i = 0; i < keys.length; i++) {
+ if (keys[i].toLocaleLowerCase().indexOf(search) >= 0) {
+ this.cache.delete(keys[i])
+ }
+ }
+
+ await this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, this.cache, false)
+ }
+
+ protected async putCache(key: string, data: unknown, staleTime = this.staleTime) {
const cacheKey = this.getKey(key)
const store = this.getStoreForCacheKey(cacheKey)
@@ -79,24 +132,41 @@ export class CacheModule {
try {
if (this.hardStorage) {
- this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, this.cache)
+ await this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, this.cache, false)
+ this.setLastHardCacheWrite()
}
} catch (e) {
if (isQuotaExceededError(e)) {
- this.clearHardCache()
+ await this.clearHardCache()
}
}
}
- clearCache() {
- this.clearHardCache()
- this.cache.clear()
+ private setLastHardCacheWrite() {
+ if (this.hardStorage) {
+ this.hardStorage.setObject('cachemodule2_' + this.keyPrefix + '_lastWrite', this.getTimestamp(), false)
+ }
+ }
+
+ public async clearCache() {
+ await this.clearHardCache()
+ this.hotOnly.clear()
+ }
+
+ public async clearNetworkCache() {
+ if (this.hardStorage) {
+ const network = await this.hardStorage.getNetworkPreferences()
+ this.deleteAllHardStorageCacheKeyContains(network.key == 'main' ? '//beaconcha.in' : '//' + network.key)
+ }
+
this.hotOnly.clear()
}
- clearHardCache() {
+ public async clearHardCache() {
if (this.hardStorage) {
- this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, null)
+ await this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, null, false)
+ this.setLastHardCacheWrite()
+ this.cache.clear()
}
}
@@ -119,7 +189,7 @@ export class CacheModule {
protected cacheMultiple(prefix: string, data: Validator[]) {
if (!data || data.length <= 0) {
- console.log('[CacheModule] ignore cache attempt of empty data set', data)
+ console.log(LOGTAG + ' ignore cache attempt of empty data set', data)
return
}
@@ -148,10 +218,11 @@ export class CacheModule {
this.cache[this.getKey(key)] = null
}
- invalidateAllCache() {
+ public invalidateAllCache() {
this.cache = new Map()
if (this.hardStorage) {
- this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, null)
+ this.hardStorage.setObject('cachemodule2_' + this.keyPrefix, null, false)
+ this.setLastHardCacheWrite()
}
}
diff --git a/src/app/utils/ClientUpdateUtils.ts b/src/app/utils/ClientUpdateUtils.ts
index 5edc25b8..7b11b20b 100644
--- a/src/app/utils/ClientUpdateUtils.ts
+++ b/src/app/utils/ClientUpdateUtils.ts
@@ -119,6 +119,7 @@ export default class ClientUpdateUtils {
private oldClientInfoConverted = false
updates: Release[] = null
lastTry = 0
+ private locked = false
constructor(private api: ApiService, private storage: StorageService) {}
@@ -127,7 +128,7 @@ export default class ClientUpdateUtils {
return null
}
- const client = Clients.find((client) => client.key == clientKey)
+ const client = Clients.find((c) => c.key == clientKey)
if (client == undefined) {
console.log('ClientInfo for', clientKey, 'not found')
return null
@@ -137,18 +138,48 @@ export default class ClientUpdateUtils {
async checkAllUpdates() {
if (this.lastTry + 10 * 60 * 1000 > Date.now()) return
- this.updates = null
+ if (this.locked) return
+
+ this.locked = true
+ const promiseArray: Promise[] = []
for (let i = 0; i < Clients.length; i++) {
- this.append(this.checkUpdateFor(await this.storage.getItem(Clients[i].storageKey)))
+ promiseArray.push(this.checkUpdateFor(await this.storage.getItem(Clients[i].storageKey)))
+ }
+
+ try {
+ const results = await Promise.all(promiseArray)
+ let changeFound = false
+ for (let i = 0; i < results.length; i++) {
+ if (results[i] && !this.contains(results[i])) {
+ changeFound = true
+ break
+ }
+ }
+
+ if (changeFound) {
+ this.updates = null
+ for (let i = 0; i < results.length; i++) {
+ if (results[i]) {
+ this.append(results[i])
+ }
+ }
+ }
+ } catch (error) {
+ console.error('An error occurred while checking for all updates:', error)
}
+ this.locked = false
}
async checkClientUpdate(clientKey: string) {
- this.remove(clientKey)
-
const client = this.getClientInfo(clientKey)
- if (client != null) {
- this.append(this.checkUpdateFor(await this.storage.getItem(client.storageKey)))
+ if (client == null) {
+ return
+ }
+ const update = await this.checkUpdateFor(await this.storage.getItem(client.storageKey))
+
+ if (update && !this.contains(update)) {
+ this.remove(clientKey)
+ this.append(update)
}
}
@@ -156,8 +187,8 @@ export default class ClientUpdateUtils {
return (await this.getUpdateChannel()) == 'PRERELEASE'
}
- private async append(info: Promise) {
- const data = await info
+ private append(info: Release) {
+ const data = info
if (!data) return
if (this.updates == null) this.updates = [data]
@@ -255,7 +286,7 @@ export default class ClientUpdateUtils {
}
async dismissRelease(clientKey: string, id: string) {
- this.storage.setObject(LOCAL_UPDATED_KEY + clientKey, { clientKey: clientKey, version: id })
+ await this.storage.setObject(LOCAL_UPDATED_KEY + clientKey, { clientKey: clientKey, version: id })
}
private async getLastClosedVersion(clientKey: string): Promise {
diff --git a/src/app/utils/EthereumUnits.ts b/src/app/utils/EthereumUnits.ts
index 6c109ea3..bc0092ac 100644
--- a/src/app/utils/EthereumUnits.ts
+++ b/src/app/utils/EthereumUnits.ts
@@ -32,27 +32,32 @@ export default class Unit {
public static SZABO = new Unit('Szabo', new BigNumber('1000000'))
public static FINNEY = new Unit('Finney', new BigNumber('1000'), 2, null, 'Finney')
- public static ETHER = new Unit('ETH', new BigNumber('1'), 5, null, 'Ether')
+ public static ETHER = new Unit('ETH', new BigNumber('1'), 5, 'XXX-ETH', 'Ether')
public static KETHER = new Unit('KETH', new BigNumber('0.001'))
public static RPL = new Unit('RPL', new BigNumber('1'), 1) // RPL TO ETH
public static RPL_NAKED = new Unit('RPL', new BigNumber('1'), 2)
public static NO_CURRENCY = new Unit('', new BigNumber('1'), 0)
public static RETH = new Unit('RETH', new BigNumber('1'), 2)
+ public static DAI_GNO_HELPER = new Unit('dummy', new BigNumber(1), 5, 'DAI-GNO')
- public static USDETH = new Unit('$', new BigNumber('388.43'), 2, 'ETH-USD', 'Dollar')
- public static EURETH = new Unit('€', new BigNumber('329.22'), 2, 'ETH-EUR', 'Euro')
- public static RUBETH = new Unit('₽', new BigNumber('38093'), 2, 'ETH-RUB', 'Rubel')
- public static JPYETH = new Unit('¥', new BigNumber('38093'), 0, 'ETH-JPY', 'Yen')
- public static GBPETH = new Unit('£', new BigNumber('368.5'), 2, 'ETH-GBP', 'Pound')
- public static AUDETH = new Unit('A$', new BigNumber('683.65'), 2, 'ETH-AUD', 'Australian Dollar')
- public static CADETH = new Unit('C$', new BigNumber('651.02'), 2, 'ETH-CAD', 'Canadian Dollar')
- public static CHFETH = new Unit('CHF', new BigNumber('455.55'), 2, 'ETH-CHF', 'Swiss Franc')
- public static MXNETH = new Unit('MXN', new BigNumber('455.55'), 2, 'ETH-MXN', 'Mexican Peso')
- public static ZARETH = new Unit('R', new BigNumber('455.55'), 2, 'ETH-ZAR', 'South African Rand')
- public static CNYETH = new Unit('元', new BigNumber('455.55'), 2, 'ETH-CNY', 'Renminbi')
- public static HKDETH = new Unit('HK$', new BigNumber('455.55'), 2, 'ETH-HKD', 'Hong Kong Dollar')
- public static NZDETH = new Unit('NZ$', new BigNumber('455.55'), 2, 'ETH-NZD', 'New Zealand Dollar')
- public static BTCETH = new Unit('₿', new BigNumber('455.55'), 6, 'ETH-BTC', 'Bitcoin') // coinbase endpoit: invalid currency :/ workaroung in unit converter
+ public static XDAI = new Unit('DAI', new BigNumber('1'), 4, 'XXX-DAI', 'xDAI')
+ public static GNO = new Unit('GNO', new BigNumber('0.03125'), 5, 'XXX-GNO', 'GNO')
+ public static MGNO = new Unit('mGNO', new BigNumber('1'), 5, 'XXX-GNO', 'mGNO')
+
+ public static USDETH = new Unit('$', new BigNumber('1'), 2, 'XXX-USD', 'Dollar')
+ public static EURETH = new Unit('€', new BigNumber('1'), 2, 'XXX-EUR', 'Euro')
+ public static RUBETH = new Unit('₽', new BigNumber('1'), 2, 'XXX-RUB', 'Rubel')
+ public static JPYETH = new Unit('¥', new BigNumber('1'), 0, 'XXX-JPY', 'Yen')
+ public static GBPETH = new Unit('£', new BigNumber('1'), 2, 'XXX-GBP', 'Pound')
+ public static AUDETH = new Unit('A$', new BigNumber('1'), 2, 'XXX-AUD', 'Australian Dollar')
+ public static CADETH = new Unit('C$', new BigNumber('1'), 2, 'XXX-CAD', 'Canadian Dollar')
+ public static CHFETH = new Unit('CHF', new BigNumber('1'), 2, 'XXX-CHF', 'Swiss Franc')
+ public static MXNETH = new Unit('MXN', new BigNumber('1'), 2, 'XXX-MXN', 'Mexican Peso')
+ public static ZARETH = new Unit('R', new BigNumber('1'), 2, 'XXX-ZAR', 'South African Rand')
+ public static CNYETH = new Unit('元', new BigNumber('1'), 2, 'XXX-CNY', 'Renminbi')
+ public static HKDETH = new Unit('HK$', new BigNumber('1'), 2, 'XXX-HKD', 'Hong Kong Dollar')
+ public static NZDETH = new Unit('NZ$', new BigNumber('1'), 2, 'XXX-NZD', 'New Zealand Dollar')
+ public static BTCETH = new Unit('₿', new BigNumber('1'), 6, 'XXX-BTC', 'Bitcoin')
private constructor(symbol: string, value: BigNumber, rounding = 2, coinbaseSpot = null, settingsName = null) {
this.display = symbol
@@ -62,10 +67,25 @@ export default class Unit {
this.settingName = settingsName
}
+ public toString(): string {
+ return (
+ this.value.toString() +
+ ' ' +
+ this.display +
+ ' (rounding: ' +
+ this.rounding +
+ ', coinbaseSpot: ' +
+ this.coinbaseSpot +
+ ', settingName: ' +
+ this.settingName +
+ ')'
+ )
+ }
+
readonly display: string
value: BigNumber
readonly rounding: number
- readonly coinbaseSpot: string
+ coinbaseSpot: string
readonly settingName: string
}
@@ -84,6 +104,9 @@ export const MAPPING = new Map([
['RPL_NAKED', Unit.RPL_NAKED],
['NO_CURRENCY', Unit.NO_CURRENCY],
['RETH', Unit.RETH],
+ ['GNO', Unit.GNO],
+ ['mGNO', Unit.MGNO],
+ ['xDAI', Unit.XDAI],
['RUBLE', Unit.RUBETH],
['YEN', Unit.JPYETH],
diff --git a/src/app/utils/HighchartOptions.ts b/src/app/utils/HighchartOptions.ts
index d3a9cd65..7482d61e 100644
--- a/src/app/utils/HighchartOptions.ts
+++ b/src/app/utils/HighchartOptions.ts
@@ -18,14 +18,14 @@
* // along with Beaconchain Dashboard. If not, see .
*/
-export function highChartOptions(where) {
+export function highChartOptions(where, hostName) {
where.setOptions({
time: {
useUTC: false,
},
credits: {
enabled: true,
- href: 'https://beaconcha.in',
+ href: 'https://' + hostName,
text: '',
style: {
color: 'var(--body-color)',
diff --git a/src/app/utils/MachineUtils.ts b/src/app/utils/MachineUtils.ts
index e875d30f..54e5900b 100644
--- a/src/app/utils/MachineUtils.ts
+++ b/src/app/utils/MachineUtils.ts
@@ -104,8 +104,8 @@ export default class MachineUtils extends CacheModule {
const machineNames = this.getAllMachineNamesFrom(result)
console.log(LOGTAG + ' machine names', machineNames)
- this.registerNewRemotesForSync(machineNames).then((result) => {
- console.log(LOGTAG + ' registerNewRemotesForSync', result)
+ this.registerNewRemotesForSync(machineNames).then((remoteResult) => {
+ console.log(LOGTAG + ' registerNewRemotesForSync', remoteResult)
})
// Storing all machine names if
diff --git a/src/app/utils/MerchantUtils.ts b/src/app/utils/MerchantUtils.ts
index bdd85860..e60257ae 100644
--- a/src/app/utils/MerchantUtils.ts
+++ b/src/app/utils/MerchantUtils.ts
@@ -98,12 +98,16 @@ export class MerchantUtils {
constructor(private alertService: AlertService, private api: ApiService, private platform: Platform, private storage: StorageService) {
if (!this.platform.is('ios') && !this.platform.is('android')) {
- console.log('merchant is not supported on this platform')
+ console.info('merchant is not supported on this platform')
return
}
+ this.init()
+ }
+
+ private async init() {
try {
- this.initProducts()
+ await this.initProducts()
this.initCustomValidator()
this.setupListeners()
} catch (e) {
@@ -144,13 +148,13 @@ export class MerchantUtils {
}
async refreshToken() {
- const refreshSuccess = (await this.api.refreshToken()) != null
+ let refreshSuccess = (await this.api.refreshToken()) != null
if (!refreshSuccess) {
console.log('refreshing token after purchase failed, scheduling retry')
const loading = await this.alertService.presentLoading('This can take a minute')
loading.present()
await this.sleep(35000)
- const refreshSuccess = (await this.api.refreshToken()) != null
+ refreshSuccess = (await this.api.refreshToken()) != null
if (!refreshSuccess) {
this.alertService.showError(
'Purchase Error',
@@ -174,7 +178,7 @@ export class MerchantUtils {
return result
}
- private initProducts() {
+ private async initProducts() {
let platform = CdvPurchase.Platform.GOOGLE_PLAY
if (this.platform.is('ios')) {
platform = CdvPurchase.Platform.APPLE_APPSTORE
@@ -189,7 +193,16 @@ export class MerchantUtils {
}
}
- CdvPurchase.store.initialize()
+ await CdvPurchase.store.initialize()
+ for (let i = 0; i < CdvPurchase.store.products.length; i++) {
+ const lastIndex = CdvPurchase.store.products[i].offers[0].pricingPhases.length - 1
+ if (lastIndex < 0) {
+ console.warn('no pricingphases found', CdvPurchase.store.products[i])
+ continue
+ }
+
+ this.updatePrice(CdvPurchase.store.products[i].id, CdvPurchase.store.products[i].offers[0].pricingPhases[lastIndex].price)
+ }
}
private updatePrice(id, price) {
@@ -204,9 +217,6 @@ export class MerchantUtils {
// General query to all products
CdvPurchase.store
.when()
- .productUpdated((p: CdvPurchase.Product) => {
- this.updatePrice(p.id, p.pricing.price)
- })
.approved((p: CdvPurchase.Transaction) => {
// Handle the product deliverable
this.currentPlan = p.products[0].id
@@ -230,7 +240,7 @@ export class MerchantUtils {
async restore() {
this.restorePurchase = true
- CdvPurchase.store.restorePurchases()
+ await CdvPurchase.store.restorePurchases()
}
async purchase(product: string) {
@@ -238,7 +248,7 @@ export class MerchantUtils {
const loading = await this.alertService.presentLoading('')
loading.present()
CdvPurchase.store.order(offer).then(
- async () => {
+ () => {
this.restorePurchase = true
setTimeout(() => {
@@ -276,12 +286,12 @@ export class MerchantUtils {
const loading = await this.alertService.presentLoading('Confirming, this might take a couple seconds')
loading.present()
- const result = await this.registerPurchaseOnRemote(purchaseData)
+ let result = await this.registerPurchaseOnRemote(purchaseData)
if (!result) {
console.log('registering receipt at remote failed, scheduling retry')
await this.sleep(35000)
- const result = await this.registerPurchaseOnRemote(purchaseData)
+ result = await this.registerPurchaseOnRemote(purchaseData)
if (!result) {
this.alertService.showError(
'Purchase Error',
@@ -386,16 +396,16 @@ export class MerchantUtils {
const currentProduct = this.findProduct(currentPlan)
if (currentProduct == null) return 100
- const notMainnet = await this.api.isNotMainnet()
+ const notMainnet = this.api.isNotEthereumMainnet()
if (notMainnet) return currentProduct.maxTestnetValidators
return currentProduct.maxValidators
}
- async getHighestPackageValidator(): Promise {
+ getHighestPackageValidator(): number {
const currentProduct = this.findProduct(MAX_PRODUCT)
if (currentProduct == null) return 100
- const notMainnet = await this.api.isNotMainnet()
+ const notMainnet = this.api.isNotEthereumMainnet()
if (notMainnet) return currentProduct.maxTestnetValidators
return currentProduct.maxValidators
}
diff --git a/src/app/utils/NetworkData.ts b/src/app/utils/NetworkData.ts
index a671f291..2376b16b 100644
--- a/src/app/utils/NetworkData.ts
+++ b/src/app/utils/NetworkData.ts
@@ -18,7 +18,7 @@
* // along with Beaconchain Dashboard. If not, see .
*/
-import { ApiNetwork } from '../models/StorageTypes'
+import { ApiNetwork, NetworkMainCurrency } from '../models/StorageTypes'
export const MAP: ApiNetwork[] = [
{
@@ -31,6 +31,29 @@ export const MAP: ApiNetwork[] = [
onlyDebug: false,
active: true,
genesisTs: 1606824023,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
+ },
+ {
+ key: 'gnosis',
+ protocol: 'https',
+ host: 'gnosischa.in',
+ net: '',
+ endpoint: '/api/',
+ version: 'v1',
+ onlyDebug: false,
+ active: true,
+ genesisTs: 1638993340,
+ clCurrency: NetworkMainCurrency.GNO,
+ elCurrency: NetworkMainCurrency.xDAI,
+ slotPerEpoch: 16,
+ slotsTime: 5,
+ epochsPerSyncPeriod: 512,
+ name: 'Gnosis',
},
{
key: 'prater',
@@ -42,6 +65,12 @@ export const MAP: ApiNetwork[] = [
onlyDebug: false,
active: true,
genesisTs: 1616508000,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
},
{
key: 'sepolia',
@@ -53,6 +82,12 @@ export const MAP: ApiNetwork[] = [
onlyDebug: false,
active: true,
genesisTs: 1655733600,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
},
{
key: 'holesky',
@@ -64,6 +99,12 @@ export const MAP: ApiNetwork[] = [
onlyDebug: false,
active: true,
genesisTs: 1695902400,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
},
{
key: 'local dev',
@@ -75,6 +116,12 @@ export const MAP: ApiNetwork[] = [
onlyDebug: true,
active: true,
genesisTs: 1606824023,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
},
{
key: 'invalid (no connection)',
@@ -86,16 +133,21 @@ export const MAP: ApiNetwork[] = [
onlyDebug: true,
active: true,
genesisTs: 1606824023,
+ clCurrency: NetworkMainCurrency.ETH,
+ elCurrency: NetworkMainCurrency.ETH,
+ slotPerEpoch: 32,
+ slotsTime: 12,
+ epochsPerSyncPeriod: 256,
+ name: 'Ethereum',
},
]
export function findConfigForKey(key: string): ApiNetwork {
for (const entry of MAP) {
if (entry.key == key) {
- console.log('found config', key, entry)
return entry
}
}
- console.debug('config for ' + key + ' not found, using mainnet instead', key)
+ console.log('config for ' + key + ' not found, using mainnet instead', key)
return MAP[0]
}
diff --git a/src/app/utils/OAuthUtils.ts b/src/app/utils/OAuthUtils.ts
index bb07859f..70d07201 100644
--- a/src/app/utils/OAuthUtils.ts
+++ b/src/app/utils/OAuthUtils.ts
@@ -75,7 +75,7 @@ export class OAuthUtils {
expiresIn: expiresIn,
})
- await this.validatorUtils.clearDeletedSet()
+ this.validatorUtils.clearDeletedSet()
await this.firebaseUtils.pushLastTokenUpstream(true)
await this.sync.fullSync()
@@ -122,7 +122,7 @@ export class OAuthUtils {
private async getOAuthOptions() {
const api = this.api
- const endpointUrl = await api.getResourceUrl('user/token')
+ const endpointUrl = api.getResourceUrl('user/token')
const info = await Device.getId().catch(() => {
return { identifier: 'iduno' }
@@ -142,7 +142,7 @@ export class OAuthUtils {
}
return {
- authorizationBaseUrl: (await api.getBaseUrl()) + '/user/authorize',
+ authorizationBaseUrl: api.getBaseUrl() + '/user/authorize',
accessTokenEndpoint: endpointUrl,
web: {
appId: clientID,
diff --git a/src/app/utils/ThemeUtils.ts b/src/app/utils/ThemeUtils.ts
index 160d5e2f..eb694330 100644
--- a/src/app/utils/ThemeUtils.ts
+++ b/src/app/utils/ThemeUtils.ts
@@ -54,13 +54,13 @@ export default class ThemeUtils {
constructor(private storage: StorageService, private platform: Platform) {}
- async init(splashScreenCallback: () => void) {
+ init(splashScreenCallback: () => void) {
this.lock = this.storage.getObject(STORAGE_KEY).then((preferenceDarkMode) => {
this.internalInit(preferenceDarkMode as StoredTheme)
setTimeout(() => {
splashScreenCallback()
this.applyColorInitially()
- }, 200)
+ }, 10)
return preferenceDarkMode as StoredTheme
})
}
diff --git a/src/app/utils/ValidatorSyncUtils.ts b/src/app/utils/ValidatorSyncUtils.ts
index b05cb195..a3c5870f 100644
--- a/src/app/utils/ValidatorSyncUtils.ts
+++ b/src/app/utils/ValidatorSyncUtils.ts
@@ -133,7 +133,7 @@ export class ValidatorSyncUtils {
}
private async deleteUp(): Promise {
- const storageKey = await this.validator.getStorageKey()
+ const storageKey = this.validator.getStorageKey()
const deletedSet = await this.validator.getDeletedSet(storageKey)
console.log('delete queue', deletedSet)
@@ -171,7 +171,7 @@ export class ValidatorSyncUtils {
private async syncUp(syncNotificationsForNewValidators: () => void) {
console.log('[SYNC] syncing up')
- const storageKey = await this.validator.getStorageKey()
+ const storageKey = this.validator.getStorageKey()
const current = await this.validator.getMap(storageKey)
const syncUpList: string[] = []
@@ -195,7 +195,7 @@ export class ValidatorSyncUtils {
}
private async syncRemoteRemovals(myRemotes: MyValidatorResponse[]) {
- const storageKey = await this.validator.getStorageKey()
+ const storageKey = this.validator.getStorageKey()
const current = await this.validator.getMap(storageKey)
const existsSynced: Set = new Set()
diff --git a/src/app/utils/ValidatorUtils.ts b/src/app/utils/ValidatorUtils.ts
index 0fcaee89..eac75edb 100644
--- a/src/app/utils/ValidatorUtils.ts
+++ b/src/app/utils/ValidatorUtils.ts
@@ -27,7 +27,6 @@ import {
AttestationPerformanceResponse,
ValidatorRequest,
ValidatorResponse,
- ValidatorETH1Request,
GetMyValidatorsRequest,
MyValidatorResponse,
DashboardRequest,
@@ -37,8 +36,10 @@ import {
SyncCommitteeResponse,
ETH1ValidatorResponse,
SyncCommitteesStatisticsResponse,
+ ProposalLuckResponse,
+ ValidatorViaDepositAddress,
+ ValidatorViaWithdrawalAddress,
} from '../requests/requests'
-import { CacheModule } from './CacheModule'
import { MerchantUtils } from './MerchantUtils'
import BigNumber from 'bignumber.js'
import { UnitconvService } from '../services/unitconv.service'
@@ -52,12 +53,6 @@ const KEYPREFIX = 'validators_'
export const LAST_TIME_ADDED_KEY = 'last_time_added'
export const LAST_TIME_REMOVED_KEY = 'last_time_removed'
-const cachePerformanceKeyBare = 'performance'
-const cacheAttestationKeyBare = 'attestationperformance'
-const epochCachedKeyBare = 'epochcached'
-const allMyKeyBare = 'allmy'
-const cacheValidatorsKeyBare = 'validators_'
-
export enum ValidatorState {
ACTIVE,
OFFLINE,
@@ -90,22 +85,21 @@ export interface Validator {
@Injectable({
providedIn: 'root',
})
-export class ValidatorUtils extends CacheModule {
+export class ValidatorUtils {
private listeners: (() => void)[] = []
private currentEpoch: EpochResponse
private olderEpoch: EpochResponse
rocketpoolStats: RocketPoolNetworkStats
syncCommitteesStatsResponse: SyncCommitteesStatisticsResponse
+ proposalLuckResponse: ProposalLuckResponse
constructor(
private api: ApiService,
private storage: StorageService,
private merchantUtils: MerchantUtils,
private unitConversion: UnitconvService
- ) {
- super('vu_') // initialize cache module with vu prefix
- }
+ ) {}
notifyListeners() {
this.listeners.forEach((callback) => callback())
@@ -116,24 +110,28 @@ export class ValidatorUtils extends CacheModule {
}
async hasLocalValdiators() {
- return (await this.getMap(await this.getStorageKey())).size > 0
+ return (await this.getMap(this.getStorageKey())).size > 0
}
async localValidatorCount() {
- return (await this.getMap(await this.getStorageKey())).size
+ return (await this.getMap(this.getStorageKey())).size
}
- public async getStorageKey(): Promise {
- return KEYPREFIX + (await this.api.getNetworkName())
+ public getStorageKey(): string {
+ return KEYPREFIX + this.api.getNetworkName()
}
async migrateTo3Dot2() {
const share = await this.storage.getStakingShare()
const valis = await this.getAllValidatorsLocal()
- for (let i = 0; i < valis.length; i++) {
- valis[i].share = share.toNumber()
+ if (valis) {
+ for (let i = 0; i < valis.length; i++) {
+ if (share) {
+ valis[i].share = share.toNumber()
+ }
+ }
+ this.saveValidatorsLocal(valis)
}
- this.saveValidatorsLocal(valis)
}
public async getMap(storageKey: string): Promise> {
@@ -164,13 +162,13 @@ export class ValidatorUtils extends CacheModule {
this.storage.setObject(storageKey + '_deleted', [...list])
}
- async clearDeletedSet() {
- const storageKey = await this.getStorageKey()
+ clearDeletedSet() {
+ const storageKey = this.getStorageKey()
this.setDeleteSet(storageKey, new Set())
}
async deleteAll() {
- const storageKey = await this.getStorageKey()
+ const storageKey = this.getStorageKey()
const current = await this.getMap(storageKey)
this.storage.setObject(storageKey, new Map())
@@ -188,7 +186,7 @@ export class ValidatorUtils extends CacheModule {
private deletedWithoutNotifying: boolean = false
async deleteValidatorLocal(validator: ValidatorResponse, notifyListeners: boolean = true) {
- const storageKey = await this.getStorageKey()
+ const storageKey = this.getStorageKey()
const current = await this.getMap(storageKey)
current.delete(validator.pubkey)
this.storage.setObject(storageKey, current)
@@ -211,7 +209,7 @@ export class ValidatorUtils extends CacheModule {
}
async saveValidatorsLocal(validators: Validator[]) {
- const storageKey = await this.getStorageKey()
+ const storageKey = this.getStorageKey()
const current = await this.getMap(storageKey)
const newMap = new Map()
@@ -229,7 +227,7 @@ export class ValidatorUtils extends CacheModule {
}
async saveRocketpoolCollateralShare(nodeAddress: string, sharePercent: number) {
- this.storage.setObject('rpl_share_' + nodeAddress, { share: sharePercent } as StoredShare)
+ await this.storage.setObject('rpl_share_' + nodeAddress, { share: sharePercent } as StoredShare)
}
async getRocketpoolCollateralShare(nodeAddress: string): Promise {
@@ -239,12 +237,12 @@ export class ValidatorUtils extends CacheModule {
}
async getValidatorLocal(pubkey: string): Promise {
- const current = await this.getMapWithoutDeleted(await this.getStorageKey())
+ const current = await this.getMapWithoutDeleted(this.getStorageKey())
return current.get(pubkey)
}
async getAllValidatorsLocal(): Promise {
- const current = await this.getMap(await this.getStorageKey())
+ const current = await this.getMap(this.getStorageKey())
const erg: Validator[] = [...current.values()]
return erg
}
@@ -260,18 +258,12 @@ export class ValidatorUtils extends CacheModule {
}
async getAllMyValidators(): Promise {
- const storageKey = await this.getStorageKey()
+ const storageKey = this.getStorageKey()
const local = await this.getMapWithoutDeleted(storageKey)
+ if (local.size == 0) return []
const validatorString = getValidatorQueryString([...local.values()], 2000, (await this.merchantUtils.getCurrentPlanMaxValidator()) - 1)
- // TODO::
- /* const cached = await this.getMultipleCached(allMyKeyBare, validatorString.split(","))
- if (cached != null) {
- console.log("return my validators from cache")
- return cached
- }*/
-
const remoteUpdatesPromise = this.getDashboardDataValidators(SAVED, validatorString).catch((err) => {
console.warn('error getAllMyValidators getDashboardDataValidators', err)
return []
@@ -289,8 +281,6 @@ export class ValidatorUtils extends CacheModule {
const result = [...local.values()]
- this.cacheMultiple(allMyKeyBare, result)
-
return result
}
@@ -305,17 +295,16 @@ export class ValidatorUtils extends CacheModule {
return false
}
- async updateValidatorStates(validators: Validator[]) {
- const epoch = await this.getRemoteCurrentEpoch()
+ updateValidatorStates(validators: Validator[]) {
validators.forEach((item) => {
- item.state = this.getValidatorState(item, epoch)
+ item.state = this.getValidatorState(item)
})
}
// checks if remote validators are already known locally.
// If not, return all indizes of non locally known validators
public async getAllNewIndicesOnly(myRemotes: MyValidatorResponse[]): Promise {
- const storageKey = await this.getStorageKey()
+ const storageKey = this.getStorageKey()
const current = await this.getMap(storageKey)
const result: number[] = []
@@ -328,22 +317,15 @@ export class ValidatorUtils extends CacheModule {
return result
}
- getValidatorState(item: Validator, currentEpoch: EpochResponse): ValidatorState {
- if (
- item.data.slashed == false &&
- item.data.lastattestationslot >= (currentEpoch.epoch - 2) * 32 && // online since last two epochs
- item.data.exitepoch >= currentEpoch.epoch &&
- item.data.activationepoch <= currentEpoch.epoch
- ) {
+ getValidatorState(item: Validator): ValidatorState {
+ if (item.data.slashed) return ValidatorState.SLASHED
+ if (item.data.status == 'exited') return ValidatorState.EXITED
+ if (item.data.status == 'deposited') return ValidatorState.ELIGABLE
+ if (item.data.status == 'pending') return ValidatorState.WAITING
+ if (item.data.slashed == false && item.data.status.indexOf('online') > 0) {
return ValidatorState.ACTIVE
}
- if (item.data.slashed) return ValidatorState.SLASHED
- if (item.data.exitepoch < currentEpoch.epoch) return ValidatorState.EXITED
- if (item.data.activationeligibilityepoch > currentEpoch.epoch) return ValidatorState.ELIGABLE
- if (item.data.activationepoch > currentEpoch.epoch) return ValidatorState.WAITING
- if (item.data.lastattestationslot < (currentEpoch.epoch - 2) * 32) return ValidatorState.OFFLINE
-
// default case
return ValidatorState.OFFLINE
}
@@ -366,7 +348,7 @@ export class ValidatorUtils extends CacheModule {
return result
}
- async getDashboardDataValidators(storage: 0 | 1, ...validators): Promise {
+ private async getDashboardDataValidators(storage: 0 | 1, ...validators): Promise {
const request = new DashboardRequest(...validators)
const response = await this.api.execute(request)
if (!request.wasSuccessful(response)) {
@@ -378,13 +360,30 @@ export class ValidatorUtils extends CacheModule {
}
const result = request.parse(response)[0]
- this.currentEpoch = result.currentEpoch[0]
- this.olderEpoch = result.olderEpoch[0]
- this.rocketpoolStats = result.rocketpool_network_stats[0]
+ if (!result) {
+ console.warn('error getDashboardDataValidators', response, result)
+ return []
+ }
+
+ if (result.currentEpoch && result.currentEpoch.length > 0) {
+ this.currentEpoch = result.currentEpoch[0]
+ } else {
+ console.warn('no current epoch information!', result)
+ }
+ if (result.olderEpoch && result.olderEpoch.length > 0) {
+ this.olderEpoch = result.olderEpoch[0]
+ } else {
+ console.warn('no older epoch information!', result)
+ }
+
+ if (result.rocketpool_network_stats && result.rocketpool_network_stats.length > 0) {
+ this.rocketpoolStats = result.rocketpool_network_stats[0]
+ }
const validatorEffectivenessResponse = result.effectiveness
const validatorsResponse = result.validators
this.syncCommitteesStatsResponse = result.sync_committees_stats
+ this.proposalLuckResponse = result.proposal_luck_stats
this.updateRplAndRethPrice()
@@ -392,16 +391,18 @@ export class ValidatorUtils extends CacheModule {
await this.storage.setLastEpochRequestTime(Date.now())
} else {
const lastCachedTime = await this.storage.getLastEpochRequestTime()
- this.currentEpoch.lastCachedTimestamp = lastCachedTime
+ if (this.currentEpoch) {
+ this.currentEpoch.lastCachedTimestamp = lastCachedTime
+ }
}
let local = null
if (storage == SAVED) {
- local = await this.getMapWithoutDeleted(await this.getStorageKey())
+ local = await this.getMapWithoutDeleted(this.getStorageKey())
}
const temp = this.convertToValidatorModel({ synced: false, storage: storage, validatorResponse: validatorsResponse })
- await this.updateValidatorStates(temp)
+ this.updateValidatorStates(temp)
for (const vali of temp) {
vali.attrEffectiveness = this.findAttributionEffectiveness(validatorEffectivenessResponse, vali.index)
vali.rocketpool = this.findRocketpoolResponse(result.rocketpool_validators, vali.index)
@@ -440,7 +441,7 @@ export class ValidatorUtils extends CacheModule {
private updateRplAndRethPrice() {
if (!this.rocketpoolStats) return
this.unitConversion.setRPLPrice(new BigNumber(this.rocketpoolStats.rpl_price.toString()))
- this.unitConversion.setRETHPrice(new BigNumber(this.rocketpoolStats.reth_exchange_rate.toString()))
+ //this.unitConversion.setRETHPrice(new BigNumber(this.rocketpoolStats.reth_exchange_rate.toString()))
}
private findExecutionResponse(list: ExecutionResponse[], index: number): ExecutionResponse {
@@ -471,7 +472,7 @@ export class ValidatorUtils extends CacheModule {
return -1
}
- async getOlderEpoch(): Promise {
+ getOlderEpoch(): EpochResponse {
return this.olderEpoch
}
@@ -496,20 +497,37 @@ export class ValidatorUtils extends CacheModule {
}
}
- async getRemoteValidatorViaETH1(arg: string, enforceMax = -1): Promise {
+ async getRemoteValidatorViaETHAddress(arg: string, enforceMax = -1): Promise {
if (!arg) return []
- const request = new ValidatorETH1Request(arg)
- const response = await this.api.execute(request)
-
- if (request.wasSuccessful(response)) {
- const eth1ValidatorList = request.parse(response)
- const queryString = getValidatorQueryString(eth1ValidatorList, 2000, enforceMax)
-
- return await this.getDashboardDataValidators(MEMORY, queryString)
- } else {
- return this.apiStatusHandler(response)
+ const viaDeposit = new ValidatorViaDepositAddress(arg)
+ const viaDepositPromise = this.api.execute(viaDeposit)
+
+ const viaWithdrawal = new ValidatorViaWithdrawalAddress(arg)
+ const viaWithdrawalPromise = this.api.execute(viaWithdrawal)
+
+ const response = await Promise.all([viaDepositPromise, viaWithdrawalPromise])
+ let result: ETH1ValidatorResponse[] = []
+
+ for (const resp of response) {
+ if (viaDeposit.wasSuccessful(resp)) {
+ // since both results are identical we can use any of the requests for parsing
+ const temp = viaDeposit.parse(resp)
+ if (temp) {
+ if (result.length > 0) {
+ result = Array.from(new Map([...result, ...temp].map((item) => [item.validatorindex, item])).values())
+ } else {
+ result = temp
+ }
+ }
+ } else {
+ return this.apiStatusHandler(response)
+ }
}
+
+ const queryString = getValidatorQueryString(result, 2000, enforceMax)
+ return await this.getDashboardDataValidators(MEMORY, queryString)
}
+
private async apiStatusHandler(response) {
if (response && response.data && response.data.status) {
return Promise.reject(new Error(response.data.status))
@@ -517,33 +535,16 @@ export class ValidatorUtils extends CacheModule {
return Promise.reject(new Error('Response is invalid'))
}
- async getCachedAttestationKey() {
- return cacheAttestationKeyBare + (await this.api.getNetworkName())
- }
-
- async getCachedPerformanceKey() {
- return cachePerformanceKeyBare + (await this.api.getNetworkName())
- }
-
- async getCachedValidatorKey() {
- return cacheValidatorsKeyBare + (await this.api.getNetworkName())
- }
-
- async getCachedEpochKey() {
- return epochCachedKeyBare + (await this.api.getNetworkName())
- }
-
// single
async convertToValidatorModelAndSaveValidatorLocal(synced: boolean, validator: ValidatorResponse) {
- this.convertToValidatorModelsAndSaveLocal(synced, [validator])
+ await this.convertToValidatorModelsAndSaveLocal(synced, [validator])
}
// multiple
async convertToValidatorModelsAndSaveLocal(synced: boolean, validator: ValidatorResponse[]) {
- this.saveValidatorsLocal(this.convertToValidatorModel({ synced, storage: SAVED, validatorResponse: validator }))
+ await this.saveValidatorsLocal(this.convertToValidatorModel({ synced, storage: SAVED, validatorResponse: validator }))
if (!synced) {
- this.storage.setObject(LAST_TIME_ADDED_KEY, { timestamp: Date.now() } as StoredTimestamp)
- this.clearCache()
+ await this.storage.setObject(LAST_TIME_ADDED_KEY, { timestamp: Date.now() } as StoredTimestamp)
}
}
@@ -585,8 +586,8 @@ export class ValidatorUtils extends CacheModule {
return result
}
- async searchValidatorsViaETH1(search: string, enforceMax = -1): Promise {
- const result = await this.getRemoteValidatorViaETH1(search, enforceMax)
+ async searchValidatorsViaETHAddress(search: string, enforceMax = -1): Promise {
+ const result = await this.getRemoteValidatorViaETHAddress(search, enforceMax)
if (result == null) return []
return result
}
diff --git a/src/theme/variables.scss b/src/theme/variables.scss
index b462eea3..7408b2c2 100644
--- a/src/theme/variables.scss
+++ b/src/theme/variables.scss
@@ -714,3 +714,24 @@ body.rocketpool.dark {
--x-toolbar-title-color: #fff;
}
+
+body.gnosis {
+ --ion-color-primary: #3e6957;
+ --ion-color-primary-rgb: 62, 105, 87;
+ --ion-color-primary-contrast: #ffffff;
+ --ion-color-primary-contrast-rgb: 255, 255, 255;
+ --ion-color-primary-shade: #e97112;
+ --ion-color-primary-tint: #0e0b0a;
+
+ --ion-toolbar-background: #3e6957; //2f2e42
+ --x-alert-primary: #3e6957;
+ --ion-color-success: #3e6957;
+ --chart-default: #3e6957;
+ --x-update-messages-background: #4c816b;
+ --x-update-messages-background-selected: #4c816b;
+
+ --status-ok: white;
+ --status-warn: white;
+ --status-danger: white;
+ --status-secondary: white;
+}