handleAccessMethod(AccountType.ZILPAY)}
- data-tip={env === Environment.PROD ? "Ensure your ZilPay is on Mainnet network" : "Ensure your ZilPay is on Testnet network"}>
+ data-tip={`Ensure your ZilPay is on ${getDefaultNetworkForEnv(envStringToEnv(env))} network`}
+ >
ZilPay
diff --git a/products/zillion/src/components/landing-stats-table.tsx b/products/zillion/src/components/landing-stats-table.tsx
index 4217392e8..1174408a6 100644
--- a/products/zillion/src/components/landing-stats-table.tsx
+++ b/products/zillion/src/components/landing-stats-table.tsx
@@ -19,6 +19,12 @@ function LandingStatsTable(props: any) {
{ loading === OperationStatus.PENDING &&
}
+
+ { loading === OperationStatus.ERROR &&
+
+ Error fetching statistics. Please refresh the page.
+
+ }
{ loading === OperationStatus.COMPLETE &&
diff --git a/products/zillion/src/components/ssn-table.tsx b/products/zillion/src/components/ssn-table.tsx
index a50c01bb8..579e705d7 100644
--- a/products/zillion/src/components/ssn-table.tsx
+++ b/products/zillion/src/components/ssn-table.tsx
@@ -251,6 +251,11 @@ function SsnTable(props: any) {
loading === OperationStatus.PENDING &&
}
+ { loading === OperationStatus.ERROR &&
+
+ Error fetching available SSNs. Please refresh the page.
+
+ }
{
loading === OperationStatus.COMPLETE &&
Number(b.stakeAmt) - Number(a.stakeAmt));
+
+ for (const ssnStats of ssnListOrderedBystakeAmt) {
+ try {
+ const hexAddress = fromBech32Address(ssnStats.address).toLowerCase();
+ const responseSsnDelegAmt: Object = yield call(ZilSdk.getSmartContractSubStateBatch, [[checksumImpl, 'ssn_deleg_amt', [hexAddress]]]);
+ const ssn_deleg_amt = (responseSsnDelegAmt as any)[0]["result"]?.["ssn_deleg_amt"]?.[hexAddress] || []
+
+ ssnStatsList = ssnStatsList.map(
+ ssn => ssn.address === ssnStats.address ? { ...ssn, delegNum: Object.keys(ssn_deleg_amt).length.toString() } : ssn
+ )
+
+ yield put(UPDATE_SSN_LIST({ ssn_list: ssnStatsList }));
+ } catch (e) {
+ console.log("fetch ssn deleg num failed", e);
+ }
}
}
@@ -186,8 +228,7 @@ function* pollStakingSaga() {
try {
yield call(pollStakingData);
} catch (e) {
- console.warn("poll staking data failed");
- console.warn(e);
+ console.error("poll staking data failed", e);
} finally {
yield delay(REFRESH_INTERVAL);
}
diff --git a/products/zillion/src/saga/userSaga.ts b/products/zillion/src/saga/userSaga.ts
index 130a9d9f2..0731d89c1 100644
--- a/products/zillion/src/saga/userSaga.ts
+++ b/products/zillion/src/saga/userSaga.ts
@@ -1,4 +1,4 @@
-import { toBech32Address } from '@zilliqa-js/zilliqa';
+import { toBech32Address } from '@zilliqa-js/crypto';
import { BigNumber } from 'bignumber.js';
import { all, call, delay, fork, put, race, select, take, takeLatest } from 'redux-saga/effects';
import { PRELOAD_INFO_READY, UPDATE_REWARD_BLK_COUNTDOWN } from '../store/stakingSlice';
@@ -25,7 +25,7 @@ function* queryAndUpdateBalance() {
logger("user balance: ", balance);
yield put(UPDATE_BALANCE({ balance: balance }));
} catch (e) {
- console.warn("query and update balance failed");
+ console.error("query and update balance failed", e);
yield put(UPDATE_BALANCE({ balance: "0" }));
}
}
@@ -52,8 +52,7 @@ function* queryAndUpdateBalance() {
}
yield put(UPDATE_ROLE({ role: role }));
} catch (e) {
- console.warn("query and update role failed");
- console.warn(e);
+ console.error("query and update role failed", e);
}
}
@@ -82,11 +81,10 @@ function* queryAndUpdateGzil() {
if (!isRespOk(response)) {
yield put(UPDATE_GZIL_BALANCE({ gzil_balance: "0" }));
} else {
- yield put(UPDATE_GZIL_BALANCE({ gzil_balance: (response as any)['balances'][address_base16] }));
+ yield put(UPDATE_GZIL_BALANCE({ gzil_balance: (response as any)['balances']?.[address_base16] || "0" }));
}
} catch (e) {
- console.warn("query and update gzil failed");
- console.warn(e);
+ console.error("query and update gzil failed", e);
yield put(UPDATE_GZIL_BALANCE({ gzil_balance: "0" }));
}
}
@@ -107,7 +105,7 @@ function* populateStakingPortfolio() {
let staking_portfolio_list: DelegStakingPortfolioStats[] = [];
let totalDeposits = new BigNumber(0);
let totalRewards = new BigNumber(0);
-
+
for (const ssnAddress in depositAmtDeleg) {
// compute total deposits
const deposit = new BigNumber(depositAmtDeleg[ssnAddress]);
@@ -141,8 +139,7 @@ function* populateStakingPortfolio() {
yield put(UPDATE_DELEG_STATS({ deleg_stats: delegStats }));
yield put(UPDATE_DELEG_PORTFOLIO({ portfolio_list: staking_portfolio_list }));
} catch (e) {
- console.warn("populate staking portfolio failed");
- console.warn(e);
+ console.error("populate staking portfolio failed", e);
yield put(UPDATE_DELEG_STATS({ deleg_stats: initialDelegStats }));
yield put(UPDATE_DELEG_PORTFOLIO({ portfolio_list: [] }));
}
@@ -185,8 +182,7 @@ function* populateSwapRequests() {
yield put(UPDATE_SWAP_DELEG_MODAL({ swap_deleg_modal: swapDelegModal }));
} catch (e) {
- console.warn("populate swap requests failed");
- console.warn(e);
+ console.error("populate swap requests failed", e);
yield put(UPDATE_SWAP_DELEG_MODAL({ swap_deleg_modal: initialSwapDelegModalData }));
}
}
@@ -210,7 +206,7 @@ function* populatePendingWithdrawal() {
let progress = '0';
let pendingWithdrawList: PendingWithdrawStats[] = [];
let totalWithdrawAmt = new BigNumber(0);
- const pendingWithdrawal = (response as any)['withdrawal_pending'][address_base16];
+ const pendingWithdrawal = (response as any)['withdrawal_pending']?.[address_base16] || [];
const { min_bnum_req } = yield select(getStakingState);
const numTxBlk: string = yield call(ZilSdk.getNumTxBlocks);
const currBlkNum = isRespOk(numTxBlk) === true ? new BigNumber(numTxBlk).minus(1) : new BigNumber(0);
@@ -250,7 +246,7 @@ function* populatePendingWithdrawal() {
yield put(UPDATE_PENDING_WITHDRAWAL_LIST({ pending_withdraw_list: pendingWithdrawList }));
yield put(UPDATE_COMPLETE_WITHDRAWAL_AMT({ complete_withdrawal_amt: `${totalWithdrawAmt}` }));
} catch (e) {
- console.warn("populate pending withdrawal failed");
+ console.error("populate pending withdrawal failed", e);
yield put(UPDATE_PENDING_WITHDRAWAL_LIST({ pending_withdraw_list: [] }));
yield put(UPDATE_COMPLETE_WITHDRAWAL_AMT({ complete_withdrawal_amt: "0" }));
}
@@ -272,7 +268,7 @@ function* populateRewardBlkCountdown() {
}
yield put(UPDATE_REWARD_BLK_COUNTDOWN({ reward_blk_countdown: `${rewardBlkCountdown}` }))
} catch (e) {
- console.warn("populate reward blk countdown failed");
+ console.error("populate reward blk countdown failed", e);
yield put(UPDATE_REWARD_BLK_COUNTDOWN({ reward_blk_countdown: "0" }))
}
}
@@ -316,7 +312,7 @@ function* populateOperatorStats() {
yield put(UPDATE_OPERATOR_STATS({ operator_stats: operatorStats }));
} catch (e) {
- console.warn("populate operator stats failed");
+ console.error("populate operator stats failed", e);
yield put(UPDATE_OPERATOR_STATS({ operator_stats: initialOperatorStats }));
} finally {
yield put(UPDATE_FETCH_OPERATOR_STATS_STATUS(OperationStatus.COMPLETE));
@@ -366,7 +362,7 @@ function* pollUserSaga() {
yield call(pollDelegatorData)
}
} catch (e) {
- console.warn("poll user data failed");
+ console.error("poll user data failed", e);
} finally {
yield put(UPDATE_FETCH_DELEG_STATS_STATUS(OperationStatus.COMPLETE));
yield delay(REFRESH_INTERVAL);
diff --git a/products/zillion/src/setupTests.ts b/products/zillion/src/setupTests.ts
deleted file mode 100644
index 74b1a275a..000000000
--- a/products/zillion/src/setupTests.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-// jest-dom adds custom jest matchers for asserting on DOM nodes.
-// allows you to do things like:
-// expect(element).toHaveTextContent(/react/i)
-// learn more: https://github.com/testing-library/jest-dom
-import '@testing-library/jest-dom/extend-expect';
diff --git a/products/zillion/src/store/blockchainSlice.ts b/products/zillion/src/store/blockchainSlice.ts
index 1ba220d60..1238535b7 100644
--- a/products/zillion/src/store/blockchainSlice.ts
+++ b/products/zillion/src/store/blockchainSlice.ts
@@ -1,13 +1,12 @@
import { createSlice } from '@reduxjs/toolkit'
-import { getNetworkConfigByEnv } from '../util/config-json-helper'
+import { getNetworkConfigForCurrentEnv } from '../util/config-helper'
export interface BlockchainState {
proxy: string,
impl: string,
blockchain: string,
staking_viewer: string,
- api_list: [],
- blockchain_explorer: string,
+ api_list: string[],
refresh_rate: number,
api_max_retry_attempt: number,
}
@@ -18,7 +17,6 @@ const initialState: BlockchainState = {
blockchain: '',
staking_viewer: '',
api_list: [],
- blockchain_explorer: '',
refresh_rate: 300000,
api_max_retry_attempt: 10,
}
@@ -35,10 +33,6 @@ const blockchainSlice = createSlice({
state.staking_viewer = staking_viewer
state.api_list = api_list
},
- UPDATE_BLOCKCHAIN_EXPLORER(state, action) {
- const { blockchain_explorer } = action.payload
- state.blockchain_explorer = blockchain_explorer
- },
UPDATE_REFRESH_RATE(state, action) {
const { refresh_rate } = action.payload
state.refresh_rate = refresh_rate
@@ -49,7 +43,7 @@ const blockchainSlice = createSlice({
},
RESET_BLOCKCHAIN_STATE(state) {
// reset config on logout
- const networkConfig = getNetworkConfigByEnv()
+ const networkConfig = getNetworkConfigForCurrentEnv()
state.proxy = networkConfig.proxy
state.impl = networkConfig.impl
state.blockchain = networkConfig.blockchain
@@ -62,7 +56,6 @@ const blockchainSlice = createSlice({
export const {
UPDATE_API_MAX_ATTEMPT,
- UPDATE_BLOCKCHAIN_EXPLORER,
UPDATE_CHAIN_INFO,
UPDATE_REFRESH_RATE,
RESET_BLOCKCHAIN_STATE,
diff --git a/products/zillion/src/util/api-randomizer.ts b/products/zillion/src/util/api-randomizer.ts
deleted file mode 100644
index 56efbab84..000000000
--- a/products/zillion/src/util/api-randomizer.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { NetworkURL } from "./enum";
-import { Random, MersenneTwister19937 } from "random-js";
-
-const randomJS = new Random(MersenneTwister19937.autoSeed());
-
-/**
- * Randomize the API
- * Generate an array of random index of 1...LIST_SIZE from the api list
- * Shuffle the array and retrieve the current index
- */
-export class ApiRandomizer {
- private static instance: ApiRandomizer;
-
- testnetIndex: number;
- mainnetIndex: number;
- randTestnetIndexList: number[];
- randMainnetIndexList: number[];
- testnetApiList: string[];
- mainnetApiList: string[];
-
- private constructor() {
- this.testnetIndex = 0;
- this.mainnetIndex = 0;
- this.testnetApiList = [];
- this.mainnetApiList = [];
- this.randTestnetIndexList = [];
- this.randMainnetIndexList = [];
- }
-
- public static getInstance(): ApiRandomizer {
- if (!ApiRandomizer.instance) {
- ApiRandomizer.instance = new ApiRandomizer()
- }
- return ApiRandomizer.instance;
- }
-
- /**
- * sets the correct api list and fetch a random one according to the network
- * @param url blockchan api url to determine which network; url is from config.json => store.blockchain
- * @param apiList list of api urls for the specific network for retry purposes; list is from config.json => store.blockchain
- * @returns a random api from the apiList
- */
- public fetchApi(url: NetworkURL, apiList: string[]) {
- if (url === NetworkURL.MAINNET && this.mainnetApiList.length === 0) {
- this.mainnetApiList = (apiList.length > 0) ? [...apiList] : ["https://api.zilliqa.com"];
- this.randMainnetIndexList = randomJS.shuffle(Array.from(Array(this.mainnetApiList.length).keys()));
- } else if (url === NetworkURL.TESTNET && this.testnetApiList.length === 0) {
- this.testnetApiList = (apiList.length > 0) ? [...apiList] : ["https://dev-api.zilliqa.com"];
- this.randTestnetIndexList = randomJS.shuffle(Array.from(Array(this.testnetApiList.length).keys()));
- }
-
- let maxLen = 0;
- let randomIndex = 0;
- let api = "";
-
- if (url === NetworkURL.MAINNET) {
- randomIndex = this.randMainnetIndexList[this.mainnetIndex];
- api = this.mainnetApiList[randomIndex];
- maxLen = this.mainnetApiList.length;
-
- // prepare the index for the next try
- this.mainnetIndex = this.mainnetIndex + 1;
- if (this.mainnetIndex >= maxLen) {
- this.mainnetIndex = 0;
- }
- } else {
- randomIndex = this.randTestnetIndexList[this.testnetIndex];
- api = this.testnetApiList[randomIndex];
- maxLen = this.testnetApiList.length;
-
- // prepare the index for the next try
- this.testnetIndex = this.testnetIndex + 1;
- if (this.testnetIndex >= maxLen) {
- this.testnetIndex = 0;
- }
- }
-
- return api;
- }
-}
\ No newline at end of file
diff --git a/products/zillion/src/util/calculator.ts b/products/zillion/src/util/calculator.ts
index d071d81b9..f8b4da97c 100644
--- a/products/zillion/src/util/calculator.ts
+++ b/products/zillion/src/util/calculator.ts
@@ -1,5 +1,6 @@
import { BN } from "@zilliqa-js/util";
-import { Zilliqa } from "@zilliqa-js/zilliqa";
+import { Zilliqa, Contract, State } from "@zilliqa-js/zilliqa";
+
const KEY_LAST_REWARD_CYCLE = 'lastrewardcycle';
const KEY_DIRECT_DEPOSIT_DELEG = 'direct_deposit_deleg';
const KEY_BUFF_DEPOSIT_DELEG = 'buff_deposit_deleg';
@@ -8,12 +9,12 @@ const KEY_LAST_WITHDRAW_CYCLE = 'last_withdraw_cycle_deleg'
const KEY_DELEG_PER_CYCLE = 'deleg_stake_per_cycle'
export class RewardCalculator {
- zilliqa: any;
- contract: any;
- last_reward_cycle_json: any;
+ zilliqa: Zilliqa;
+ contract: Contract;
+ last_reward_cycle_json: State;
- constructor(url: string, ssnlist: string) {
- this.zilliqa = new Zilliqa(url);
+ constructor(zilliqa: Zilliqa, ssnlist: string) {
+ this.zilliqa = zilliqa;
this.contract = this.zilliqa.contracts.at(ssnlist);
}
@@ -33,7 +34,7 @@ export class RewardCalculator {
// get reward cycle list
- async get_reward_cycle_list(last_withdraw_cycle_map: any, last_reward_cycle_json: any, ssnaddr: string, delegator: string) {
+ async get_reward_cycle_list(last_withdraw_cycle_map: any, last_reward_cycle_json: State, ssnaddr: string, delegator: string) {
// remove this
// console.log(last_withdraw_cycle_map);
diff --git a/products/zillion/src/util/config-helper.ts b/products/zillion/src/util/config-helper.ts
new file mode 100644
index 000000000..66c0f9810
--- /dev/null
+++ b/products/zillion/src/util/config-helper.ts
@@ -0,0 +1,64 @@
+import { getEnvironment, getNetworks, NetworkConfig } from "./config-json-helper";
+import { Environment, Network } from "./enum";
+
+export function envStringToEnv(env: string): Environment {
+ const selectedEnv = Object.entries(Environment).find(([key, val]) => val === env);
+
+ if (!selectedEnv) {
+ const environmentKeys = Object.values(Environment).join(', ');
+ throw new Error(`Invalid environment: ${env}. Available environments: ${environmentKeys}`);
+ }
+
+ return selectedEnv[1]
+}
+
+export function getDefaultNetworkForEnv(env: Environment): Network {
+ return {
+ [Environment.PROD]: Network.MAINNET,
+ [Environment.STAGE]: Network.TESTNET,
+ [Environment.DEV]: Network.TESTNET,
+ [Environment.STAGE_ZQ2_PROTOMAINNET]: Network.ZQ2_PROTOMAINNET
+ }[env];
+}
+
+export function getDefaultNetworkForCurrentEnv(): Network {
+ return getDefaultNetworkForEnv(
+ envStringToEnv(
+ getEnvironment()
+ )
+ );
+}
+
+export function networkStringToNetwork(network: string): Network {
+ const selectedNetwork = Object.entries(Network).find(([key, val]) => val === network);
+
+ if (!selectedNetwork) {
+ const networkKeys = Object.values(Network).join(', ');
+ throw new Error(`Invalid network: ${network}. Available networks: ${networkKeys}`);
+ }
+
+ return selectedNetwork[1]
+}
+
+export function getNetworkConfigByEnv(env: Environment): NetworkConfig {
+ const defaultEnvNetwork = getDefaultNetworkForEnv(env);
+ return getNetworks()[defaultEnvNetwork];
+}
+
+export function getNetworkConfigForCurrentEnv(): NetworkConfig {
+ return getNetworkConfigByEnv(
+ envStringToEnv(
+ getEnvironment()
+ )
+ );
+}
+
+export function networkToNetworkName(network: Network): string {
+ return {
+ [Network.TESTNET]: 'Testnet',
+ [Network.MAINNET]: 'Mainnet',
+ [Network.ISOLATED_SERVER]: 'Isolated Server',
+ [Network.PRIVATE]: 'Private',
+ [Network.ZQ2_PROTOMAINNET]: 'ZQ2 Protomainnet'
+ }[network];
+}
diff --git a/products/zillion/src/util/config-json-helper.ts b/products/zillion/src/util/config-json-helper.ts
index 51d162f5e..328f39d19 100644
--- a/products/zillion/src/util/config-json-helper.ts
+++ b/products/zillion/src/util/config-json-helper.ts
@@ -2,15 +2,21 @@
* helper file to extract info from public/config.js
*/
-import { Environment, Network } from "./enum";
+import { Network } from "./enum";
const {
api_max_retry_attempt,
- blockchain_explorer_config,
environment_config,
networks_config,
refresh_rate_config
-} = (window as { [key: string]: any })['config'];
+} = (window as any as {
+ config: {
+ api_max_retry_attempt: number,
+ environment_config: string,
+ networks_config: Networks,
+ refresh_rate_config: number
+ }
+ })['config'];
export interface NetworkConfig {
@@ -18,13 +24,14 @@ export interface NetworkConfig {
impl: string
blockchain: string
node_status: string
- api_list: []
+ api_list: string[]
}
export interface Networks {
[Network.TESTNET]: NetworkConfig
[Network.MAINNET]: NetworkConfig
[Network.ISOLATED_SERVER]: NetworkConfig
+ [Network.ZQ2_PROTOMAINNET]: NetworkConfig
[Network.PRIVATE]: NetworkConfig // not in used in config.json
}
@@ -32,10 +39,6 @@ export const getEnvironment = () => {
return environment_config;
}
-export const getBlockchainExplorer = () => {
- return blockchain_explorer_config;
-}
-
export const getRefreshRate = (): number => {
return refresh_rate_config;
}
@@ -44,19 +47,18 @@ export const getApiMaxRetry = () => {
return api_max_retry_attempt || 10;
}
-// returns entire networks_config json
-// e.g. networks_config : { testnet: { ... } , mainnet: { ... } }
-export const getNetworks = (): Networks => {
+export const getNetworks = () => {
return networks_config;
}
-// return only specfic networks_config section
-// according to environment_config
-// e.g. mainnet : { proxy: "", impl: "" }
-export const getNetworkConfigByEnv = (): NetworkConfig => {
- if (environment_config === Environment.PROD) {
- return networks_config[Network.MAINNET]
- }
- // defaults to testnet
- return networks_config[Network.TESTNET]
-}
\ No newline at end of file
+export const tryGetNetworkLabelByApiUrl = (api: string): Network | undefined => {
+ const availableNetworks = Object.entries(getNetworks()) as [string, NetworkConfig][];
+
+ const formattedApiName = api.startsWith("https://") ? api : `https://${api}`;
+
+ const networkWithApi = availableNetworks.find(
+ ([label, config]) => config.api_list.includes(formattedApiName)
+ );
+
+ return networkWithApi ? networkWithApi[0] as Network : undefined;
+}
diff --git a/products/zillion/src/util/enum.ts b/products/zillion/src/util/enum.ts
index 21134bdfd..530ad4cc1 100644
--- a/products/zillion/src/util/enum.ts
+++ b/products/zillion/src/util/enum.ts
@@ -30,12 +30,8 @@ export enum Constants {
export enum Environment {
DEV = "dev",
PROD = "prod",
- STAGE = "stage"
-}
-
-export enum Explorer {
- DEVEX = "devex",
- VIEWBLOCK = "viewblock"
+ STAGE = "stage",
+ STAGE_ZQ2_PROTOMAINNET = "stage_zq2_protomainnet"
}
export enum LedgerIndex {
@@ -46,13 +42,15 @@ export enum Network {
TESTNET = "testnet",
MAINNET = "mainnet",
ISOLATED_SERVER = "isolated_server",
- PRIVATE = "private"
+ PRIVATE = "private",
+ ZQ2_PROTOMAINNET = "zq2_protomainnet",
}
export enum NetworkURL {
TESTNET = "https://dev-api.zilliqa.com",
MAINNET = "https://api.zilliqa.com",
- ISOLATED_SERVER = "https://zilliqa-isolated-server.zilliqa.com"
+ ISOLATED_SERVER = "https://zilliqa-isolated-server.zilliqa.com",
+ ZQ2_PROTOMAINNET = "https://api.zq2-protomainnet.zilliqa.com"
}
export enum OperationStatus {
diff --git a/products/zillion/src/util/reward-calculator.ts b/products/zillion/src/util/reward-calculator.ts
index b925cf9f4..7d950b350 100644
--- a/products/zillion/src/util/reward-calculator.ts
+++ b/products/zillion/src/util/reward-calculator.ts
@@ -1,19 +1,16 @@
-import store from "../store/store";
-import { ApiRandomizer } from "./api-randomizer";
+import { Zilliqa } from "@zilliqa-js/zilliqa";
import { getApiMaxRetry } from "./config-json-helper";
-import { NetworkURL } from "./enum";
import { RewardCalculator } from "./calculator";
-
-const apiRandomizer = ApiRandomizer.getInstance();
+import { ZilSdk } from "../zilliqa-api";
// config.js from public folder
const API_MAX_ATTEMPT = getApiMaxRetry();
let rewardCalculator: RewardCalculator | null = null;
-export const computeDelegRewardsExec = async (impl: string, networkURL: string, ssn: string, delegator: string) => {
+export const computeDelegRewardsExec = async (impl: string, zilliqa: Zilliqa, ssn: string, delegator: string) => {
if (!rewardCalculator) {
- rewardCalculator = new RewardCalculator(networkURL, impl);
+ rewardCalculator = new RewardCalculator(zilliqa, impl);
try {
await rewardCalculator.compute_maps();
} catch (err) {
@@ -32,9 +29,8 @@ export const computeDelegRewards = async (impl: string, ssn: string, delegator:
for (let attempt = 0; attempt < API_MAX_ATTEMPT; attempt++) {
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = apiRandomizer.fetchApi(blockchain as NetworkURL, api_list);
- result = await computeDelegRewardsExec(impl, randomAPI, ssn, delegator);
+ const zilliqa = ZilSdk.getZilliqaApi();
+ result = await computeDelegRewardsExec(impl, zilliqa, ssn, delegator);
break;
} catch (err) {
// error with querying api
diff --git a/products/zillion/src/util/use-local-storage.ts b/products/zillion/src/util/use-local-storage.ts
index 3adc66b5c..edf4b26f5 100644
--- a/products/zillion/src/util/use-local-storage.ts
+++ b/products/zillion/src/util/use-local-storage.ts
@@ -1,4 +1,4 @@
-import { convertNetworkUrlToLabel } from "./utils";
+import { tryGetNetworkLabelByApiUrl } from "./config-json-helper";
/**
* https://developer.mozilla.org/en-US/docs/Web/API/Web_Storage_API/Using_the_Web_Storage_API#Feature-detecting_localStorage
@@ -36,13 +36,13 @@ export function isStorageAvailable(type: string) {
* value: storage value
*
*/
-export function storeLocalItem(wallet: string, proxy: string, network: string, key: string, value: any) {
+export function storeLocalItem(wallet: string, proxy: string, networkUrl: string, key: string, value: any) {
if (!isStorageAvailable("localStorage")) {
return null;
}
- network = convertNetworkUrlToLabel(network);
+ const network = tryGetNetworkLabelByApiUrl(networkUrl);
const storedValue: any = window.localStorage.getItem(wallet);
let currStorageMap: any;
@@ -91,12 +91,12 @@ export function storeLocalItem(wallet: string, proxy: string, network: string, k
* network: blockchain url will convert to label later
* key: storage key
*/
-export function getLocalItem(wallet: string, proxy: string, network: string, key: string, defaultValue: any) {
+export function getLocalItem(wallet: string, proxy: string, networkUrl: string, key: string, defaultValue: any) {
if (!isStorageAvailable("localStorage")) {
return defaultValue;
}
- network = convertNetworkUrlToLabel(network);
+ const network = tryGetNetworkLabelByApiUrl(networkUrl);
const storedValue: any = window.localStorage.getItem(wallet);
if (proxy === null || proxy === "") {
diff --git a/products/zillion/src/util/utils.ts b/products/zillion/src/util/utils.ts
index e1f98d1f7..9362c8502 100644
--- a/products/zillion/src/util/utils.ts
+++ b/products/zillion/src/util/utils.ts
@@ -1,17 +1,13 @@
import { toBech32Address, fromBech32Address } from '@zilliqa-js/crypto';
-import { Explorer, NetworkURL, Network, TransactionType, AccountType, Constants, OperationStatus } from './enum';
+import { NetworkURL, Network, TransactionType, AccountType, Constants, OperationStatus } from './enum';
import Alert from '../components/alert';
import { ZilSigner } from '../zilliqa-signer';
-import { getBlockchainExplorer } from './config-json-helper';
+import { tryGetNetworkLabelByApiUrl } from './config-json-helper';
import { SsnStats } from './interface';
import { ZilSdk } from '../zilliqa-api';
import { BN, validation, units } from '@zilliqa-js/util';
import BigNumber from 'bignumber.js';
-
-// config.js from public folder
-const blockchain_explorer_config = getBlockchainExplorer();
-
export const bech32ToChecksum = (address: string) => {
if (validation.isAddress(address)) {
// convert to checksum format
@@ -126,34 +122,17 @@ export const convertGzilToCommaStr = (inputVal: string) => {
return frontAmt + "." + backAmt;
}
-export const convertNetworkUrlToLabel = (url: string) => {
- let label = '';
- switch (url) {
- case NetworkURL.MAINNET:
- label = Network.MAINNET;
- break;
- case NetworkURL.TESTNET:
- label = Network.TESTNET;
- break;
- default:
- label = Network.TESTNET;
- break;
- }
- return label;
-}
-
export const getTxnLink = (txnId: string, networkURL: string) => {
let link = "";
- if (blockchain_explorer_config === Explorer.VIEWBLOCK) {
- if (networkURL === NetworkURL.MAINNET) {
- link = "https://viewblock.io/zilliqa/tx/0x" + txnId
- } else {
- link = "https://viewblock.io/zilliqa/tx/0x" + txnId + "?network=testnet"
- }
- } else {
- // devex
- link = "https://devex.zilliqa.com/tx/0x" + txnId + "?network=" + networkURL;
+ const network = tryGetNetworkLabelByApiUrl(networkURL);
+
+ switch (network) {
+ case Network.MAINNET: link = "https://viewblock.io/zilliqa/tx/0x" + txnId; break;
+ case Network.PRIVATE:
+ case Network.ISOLATED_SERVER:
+ case Network.TESTNET: link = "https://viewblock.io/zilliqa/tx/0x" + txnId + "?network=testnet"; break;
+ case Network.ZQ2_PROTOMAINNET: link = "https://explorer.zq2-protomainnet.zilliqa.com/tx/" + txnId; break;
}
return link;
@@ -161,16 +140,14 @@ export const getTxnLink = (txnId: string, networkURL: string) => {
export const getAddressLink = (address: string, networkURL: string) => {
let link = "";
-
- if (blockchain_explorer_config === Explorer.VIEWBLOCK) {
- if (networkURL === NetworkURL.MAINNET) {
- link = "https://viewblock.io/zilliqa/address/" + address
- } else {
- link = "https://viewblock.io/zilliqa/address/" + address + "?network=testnet"
- }
- } else {
- // devex
- link = "https://devex.zilliqa.com/address/" + address + "?network=" + networkURL;
+ const network = tryGetNetworkLabelByApiUrl(networkURL);
+
+ switch (network) {
+ case Network.MAINNET: link = "https://viewblock.io/zilliqa/address/" + address; break;
+ case Network.PRIVATE:
+ case Network.ISOLATED_SERVER:
+ case Network.TESTNET: link = "https://viewblock.io/zilliqa/address/" + address + "?network=testnet"; break;
+ case Network.ZQ2_PROTOMAINNET: link = "https://explorer.zq2-protomainnet.zilliqa.com/address/" + address; break;
}
return link;
diff --git a/products/zillion/src/zilliqa-api.ts b/products/zillion/src/zilliqa-api.ts
index ea7bb2e27..f034b7d3a 100644
--- a/products/zillion/src/zilliqa-api.ts
+++ b/products/zillion/src/zilliqa-api.ts
@@ -1,15 +1,36 @@
import { Zilliqa } from "@zilliqa-js/zilliqa";
import store from "./store/store";
-import { ApiRandomizer } from "./util/api-randomizer";
import { getApiMaxRetry } from "./util/config-json-helper";
-import { NetworkURL, OperationStatus } from "./util/enum";
+import { OperationStatus } from "./util/enum";
import { logger } from "./util/logger";
const API_MAX_ATTEMPT = getApiMaxRetry();
-const API_RANDOMIZER = ApiRandomizer.getInstance();
export class ZilSdk {
+ private static currentApiIndextoCallForNetwork: Record = {};
+
+ /**
+ * return the zilliqa api object based on the selected url from the networks_config.api_list
+ * It follows according to round robbin through the api list starting at random index
+ */
+ public static getZilliqaApi() {
+ const { blockchain, api_list } = store.getState().blockchain
+
+ if (ZilSdk.currentApiIndextoCallForNetwork[blockchain] === undefined) {
+ // we start counter from random index to avoid all clients calling the same api at start
+ ZilSdk.currentApiIndextoCallForNetwork[blockchain] = Math.floor(Math.random() * api_list.length)
+ }
+
+ // we could do that after creating object, but if for some reason the config changes
+ // then with doing this first we never go out of bound
+ ZilSdk.currentApiIndextoCallForNetwork[blockchain] += 1 % api_list.length;
+
+ const currentApi = api_list[ZilSdk.currentApiIndextoCallForNetwork[blockchain]];
+
+ return new Zilliqa(currentApi);
+ }
+
/**
* query the contract state using random api via batch JSON-RPC
* @param queryList an array of array in the form [ [impl_address, contract_field, [indices], [impl_address, contract_field2, [indices]] ] ]
@@ -27,9 +48,7 @@ export class ZilSdk {
private static getActualSmartContractSubStateBatch = async (queryList: any[]): Promise => {
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = API_RANDOMIZER.fetchApi(blockchain as NetworkURL, api_list);
- const zilliqa = new Zilliqa(randomAPI);
+ const zilliqa = ZilSdk.getZilliqaApi()
let response: any = await zilliqa.blockchain.getSmartContractSubStateBatch(queryList);
@@ -134,9 +153,7 @@ export class ZilSdk {
private static getActualNumTxBlocks = async () => {
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = API_RANDOMIZER.fetchApi(blockchain as NetworkURL, api_list);
- const zilliqa = new Zilliqa(randomAPI);
+ const zilliqa = ZilSdk.getZilliqaApi()
const response = await zilliqa.blockchain.getBlockChainInfo();
if (!response.hasOwnProperty("result") || response.result === undefined) {
@@ -150,9 +167,7 @@ export class ZilSdk {
private static getActualTotalCoinSupply = async () => {
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = API_RANDOMIZER.fetchApi(blockchain as NetworkURL, api_list);
- const zilliqa = new Zilliqa(randomAPI);
+ const zilliqa = ZilSdk.getZilliqaApi()
const response = await zilliqa.blockchain.getTotalCoinSupply();
if (!response.hasOwnProperty("result") || response.result === undefined) {
@@ -166,9 +181,7 @@ export class ZilSdk {
private static getActualBalance = async (address: string) => {
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = API_RANDOMIZER.fetchApi(blockchain as NetworkURL, api_list);
- const zilliqa = new Zilliqa(randomAPI);
+ const zilliqa = ZilSdk.getZilliqaApi()
const response = await zilliqa.blockchain.getBalance(address);
if (!response.hasOwnProperty("result") || response.result.balance === undefined) {
@@ -196,9 +209,7 @@ export class ZilSdk {
}
try {
- const { blockchain, api_list } = store.getState().blockchain
- const randomAPI = API_RANDOMIZER.fetchApi(blockchain as NetworkURL, api_list);
- const zilliqa = new Zilliqa(randomAPI);
+ const zilliqa = ZilSdk.getZilliqaApi()
let response: any = null;
if (indices !== null) {