Add cluster url param and rename tds to testnet

This commit is contained in:
Justin Starry 2020-03-31 14:07:19 +08:00 committed by Michael Vines
parent 82cdd1babe
commit c47c3acb10
1 changed files with 32 additions and 16 deletions

View File

@ -10,14 +10,14 @@ export enum NetworkStatus {
export enum Network { export enum Network {
MainnetBeta, MainnetBeta,
TdS, Testnet,
Devnet, Devnet,
Custom Custom
} }
export const NETWORKS = [ export const NETWORKS = [
Network.MainnetBeta, Network.MainnetBeta,
Network.TdS, Network.Testnet,
Network.Devnet, Network.Devnet,
Network.Custom Network.Custom
]; ];
@ -26,7 +26,7 @@ export function networkName(network: Network): string {
switch (network) { switch (network) {
case Network.MainnetBeta: case Network.MainnetBeta:
return "Mainnet Beta"; return "Mainnet Beta";
case Network.TdS: case Network.Testnet:
return "Testnet"; return "Testnet";
case Network.Devnet: case Network.Devnet:
return "Devnet"; return "Devnet";
@ -36,7 +36,7 @@ export function networkName(network: Network): string {
} }
export const MAINNET_BETA_URL = "https://api.mainnet-beta.solana.com"; export const MAINNET_BETA_URL = "https://api.mainnet-beta.solana.com";
export const TDS_URL = "https://tds.solana.com"; export const TESTNET_URL = "https://testnet.solana.com";
export const DEVNET_URL = testnetChannelEndpoint("stable"); export const DEVNET_URL = testnetChannelEndpoint("stable");
export const DEFAULT_NETWORK = Network.MainnetBeta; export const DEFAULT_NETWORK = Network.MainnetBeta;
@ -78,28 +78,44 @@ function networkReducer(state: State, action: Action): State {
} }
function initState(): State { function initState(): State {
const networkUrlParam = const clusterParam =
findGetParameter("cluster") || findGetParameter("network");
const clusterUrlParam =
findGetParameter("clusterUrl") || findGetParameter("networkUrl"); findGetParameter("clusterUrl") || findGetParameter("networkUrl");
let network; let network;
let customUrl = DEFAULT_CUSTOM_URL; let customUrl = DEFAULT_CUSTOM_URL;
switch (networkUrlParam) { switch (clusterUrlParam) {
case null:
network = DEFAULT_NETWORK;
break;
case MAINNET_BETA_URL: case MAINNET_BETA_URL:
network = Network.MainnetBeta; network = Network.MainnetBeta;
break; break;
case DEVNET_URL: case DEVNET_URL:
network = Network.Devnet; network = Network.Devnet;
break; break;
case TDS_URL: case TESTNET_URL:
network = Network.TdS; network = Network.Testnet;
break; break;
default: }
switch (clusterParam) {
case "mainnet-beta":
network = Network.MainnetBeta;
break;
case "devnet":
network = Network.Devnet;
break;
case "testnet":
network = Network.Testnet;
break;
}
if (!network) {
if (!clusterUrlParam) {
network = DEFAULT_NETWORK;
} else {
network = Network.Custom; network = Network.Custom;
customUrl = networkUrlParam || DEFAULT_CUSTOM_URL; customUrl = clusterUrlParam;
break; }
} }
return { return {
@ -140,8 +156,8 @@ export function networkUrl(network: Network, customUrl: string): string {
return DEVNET_URL; return DEVNET_URL;
case Network.MainnetBeta: case Network.MainnetBeta:
return MAINNET_BETA_URL; return MAINNET_BETA_URL;
case Network.TdS: case Network.Testnet:
return TDS_URL; return TESTNET_URL;
case Network.Custom: case Network.Custom:
return customUrl; return customUrl;
} }