Page MenuHomePhabricator
Files F13115238

D13495.diff
No OneTemporary
Actions

D13495.diff
View Options

diff --git a/web/cashtab/src/hooks/useWallet.js b/web/cashtab/src/hooks/useWallet.js
--- a/web/cashtab/src/hooks/useWallet.js
+++ b/web/cashtab/src/hooks/useWallet.js
@@ -37,7 +37,7 @@
getTxHistoryChronik,
parseChronikTx,
} from 'utils/chronik';
-import { getAliasServerHistory } from 'utils/aliasUtils';
+import { getAliasServerHistory, getAliasServerState } from 'utils/aliasUtils';
import { ChronikClient } from 'chronik-client';
import cashaddr from 'ecashaddrjs';
import * as bip39 from 'bip39';
@@ -1170,21 +1170,21 @@
cachedAliases = currency.defaultCashtabCache.aliasCache;
}
- // retrieve onchain aliases via alias-server
- let aliasServerRespJson;
+ // retrieve alias-server state
+ let aliasServerStateRespJson;
try {
- aliasServerRespJson = await getAliasServerHistory();
+ aliasServerStateRespJson = await getAliasServerState();
} catch (err) {
console.log(
- `getLatestAliases(): Error retrieving aliases from alias-server`,
+ `getLatestAliases(): Error retrieving server state from alias-server`,
err,
);
}
// get the onchain alias count
let onchainAliasCount = 0;
- if (aliasServerRespJson) {
- onchainAliasCount = aliasServerRespJson.length;
+ if (aliasServerStateRespJson) {
+ onchainAliasCount = aliasServerStateRespJson.registeredAliasCount;
}
// get the cached alias count
@@ -1198,6 +1198,18 @@
console.log(
`cache alias count does not match onchain alias count, refreshing aliasCache`,
);
+
+ // retrieve onchain aliases via alias-server
+ let aliasServerRespJson;
+ try {
+ aliasServerRespJson = await getAliasServerHistory();
+ } catch (err) {
+ console.log(
+ `getLatestAliases(): Error retrieving aliases from alias-server`,
+ err,
+ );
+ }
+
let aliasCacheObject = {
aliases: aliasServerRespJson,
cachedAliasCount: aliasServerRespJson.length,
diff --git a/web/cashtab/src/utils/aliasUtils.js b/web/cashtab/src/utils/aliasUtils.js
--- a/web/cashtab/src/utils/aliasUtils.js
+++ b/web/cashtab/src/utils/aliasUtils.js
@@ -1,5 +1,31 @@
import { currency } from 'components/Common/Ticker';
+/*
+ @response:
+ {
+ processedBlockheight: 785354,
+ processedConfirmedTxs: 718,
+ registeredAliasCount: 426,
+ registrationAddress: 'ecash:qp3c268rd5946l2f5m5es4x25f7ewu4sjvpy52pqa8',
+ }
+*/
+export const getAliasServerState = async () => {
+ let aliasServerResp, aliasServerRespJson;
+ try {
+ aliasServerResp = await fetch(
+ currency.aliasSettings.aliasServerBaseUrl + '/state',
+ );
+ aliasServerRespJson = aliasServerResp.json();
+ } catch (err) {
+ console.log(
+ `getAliasServerState(): Error retrieving server state from alias-server`,
+ err,
+ );
+ }
+
+ return aliasServerRespJson;
+};
+
/*
@response:
[

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 10:25 (11 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187348
Default Alt Text
D13495.diff (3 KB)

Event Timeline