feat: simplify without testnet

forbole · Apr 10, 2024 · 1fcd98e · 1fcd98e
1 parent 6017041
commit 1fcd98e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 54 deletions.
diff --git a/src/screens/staking/lib/staking_sdk/core/base.ts b/src/screens/staking/lib/staking_sdk/core/base.ts
@@ -41,7 +41,6 @@ export enum StakingNetworkId {
   Osmosis = "osmosis-1",
   Solana = "solana",
   SolanaDevnet = "solana-devnet",
-  SolanaTestnet = "solana-testnet",
   Stargaze = "stargaze-1",
   StargazeTestnet = "elgafar-1",
 }
@@ -59,7 +58,6 @@ export const mainNetworkDenom: Record<StakingNetworkId, CoinDenom | null> = {
   [StakingNetworkId.Osmosis]: CoinDenom.OSMO,
   [StakingNetworkId.Solana]: CoinDenom.SOL,
   [StakingNetworkId.SolanaDevnet]: CoinDenom.SOL,
-  [StakingNetworkId.SolanaTestnet]: CoinDenom.SOL,
   [StakingNetworkId.Stargaze]: CoinDenom.STARS,
   [StakingNetworkId.StargazeTestnet]: CoinDenom.STARS,
 };
@@ -68,7 +66,6 @@ export const testnetNetworks = new Set([
   StakingNetworkId.CelestiaTestnet,
   StakingNetworkId.CosmosHubTestnet,
   StakingNetworkId.KavaTestnet,
-  StakingNetworkId.SolanaTestnet,
   StakingNetworkId.SolanaDevnet,
   StakingNetworkId.StargazeTestnet,
 ]);
diff --git a/src/screens/staking/lib/staking_sdk/core/index.ts b/src/screens/staking/lib/staking_sdk/core/index.ts
@@ -40,7 +40,6 @@ export const networkIdToNetworkKey: Record<StakingNetworkId, NetworkKey> = {
   [StakingNetworkId.Osmosis]: "osmosis",
   [StakingNetworkId.Solana]: "solana",
   [StakingNetworkId.SolanaDevnet]: "solana-devnet",
-  [StakingNetworkId.SolanaTestnet]: "solana-testnet",
   [StakingNetworkId.Stargaze]: "stargaze",
   [StakingNetworkId.StargazeTestnet]: "stargaze-testnet",
 };

diff --git a/src/screens/staking/lib/staking_sdk/core/solana.ts b/src/screens/staking/lib/staking_sdk/core/solana.ts
@@ -6,11 +6,7 @@ import {
 } from "./base";
 
 export const solanaNetworks = new Set(
-  [
-    StakingNetworkId.Solana,
-    StakingNetworkId.SolanaTestnet,
-    StakingNetworkId.SolanaDevnet,
-  ].filter(
+  [StakingNetworkId.Solana, StakingNetworkId.SolanaDevnet].filter(
     ENABLE_TESTNETS ? () => true : (network) => !testnetNetworks.has(network),
   ),
 );

diff --git a/src/screens/staking/lib/staking_sdk/utils/accounts.ts b/src/screens/staking/lib/staking_sdk/utils/accounts.ts
@@ -107,12 +107,10 @@ export const getExplorerLink = (address: string, network?: string) => {
   switch (network) {
     case StakingNetworkId.Solana:
     case StakingNetworkId.SolanaDevnet:
-    case StakingNetworkId.SolanaTestnet:
       return `https://explorer.solana.com/address/${address}?cluster=${
         {
           [StakingNetworkId.Solana]: "mainnet",
           [StakingNetworkId.SolanaDevnet]: "devnet",
-          [StakingNetworkId.SolanaTestnet]: "testnet",
         }[network]
       }`;
     default:

diff --git a/src/screens/staking/lib/staking_sdk/utils/coins.ts b/src/screens/staking/lib/staking_sdk/utils/coins.ts
@@ -16,7 +16,6 @@ export const networkToUnnormalisedDenom = {
   [StakingNetworkId.Osmosis]: "UOSMO",
   [StakingNetworkId.Solana]: "LAMPORTS",
   [StakingNetworkId.SolanaDevnet]: "LAMPORTS",
-  [StakingNetworkId.SolanaTestnet]: "LAMPORTS",
   [StakingNetworkId.Stargaze]: "USTARS",
   [StakingNetworkId.StargazeTestnet]: "USTARS",
 } as const satisfies Record<StakingNetworkId, string>;

diff --git a/src/screens/staking/lib/staking_sdk/wallet_operations/solana.ts b/src/screens/staking/lib/staking_sdk/wallet_operations/solana.ts
@@ -28,11 +28,9 @@ import type {
 import { StakeError, UnstakeError, WithdrawUnstakedError } from "./base";
 
 const mainnetWallet = new Solflare({});
-const testnetWallet = new Solflare({ network: "testnet" });
 const devnetWallet = new Solflare({ network: "devnet" });
 
 let connectListenerMainnet: (() => void) | undefined;
-let connectListenerTestnet: (() => void) | undefined;
 let connectListenerDevnet: (() => void) | undefined;
 
 const isCloseError = (error: Error) =>
@@ -56,9 +54,6 @@ export const tryToConnectSolflare = async (
 
     const hasMainnetWallet = solanaNetworks.has(StakingNetworkId.Solana);
 
-    const hasTestnetWallet =
-      ENABLE_TESTNETS && solanaNetworks.has(StakingNetworkId.SolanaTestnet);
-
     const hasDevnetWallet =
       ENABLE_TESTNETS && solanaNetworks.has(StakingNetworkId.SolanaDevnet);
 
@@ -105,11 +100,9 @@ export const tryToConnectSolflare = async (
 
           resolvedItems += 1;
 
-          const totalItems = [
-            hasMainnetWallet,
-            hasTestnetWallet,
-            hasDevnetWallet,
-          ].filter(Boolean).length;
+          const totalItems = [hasMainnetWallet, hasDevnetWallet].filter(
+            Boolean,
+          ).length;
 
           if (resolvedItems === totalItems) {
             resolve(true);
@@ -132,18 +125,6 @@ export const tryToConnectSolflare = async (
       mainnetWallet.on("connect", connectListenerMainnet);
     }
 
-    if (hasTestnetWallet) {
-      if (connectListenerTestnet)
-        testnetWallet.off("connect", connectListenerTestnet);
-
-      connectListenerTestnet = getListener(
-        testnetWallet,
-        StakingNetworkId.SolanaTestnet,
-      );
-
-      testnetWallet.on("connect", connectListenerTestnet);
-    }
-
     if (hasDevnetWallet) {
       if (connectListenerDevnet)
         devnetWallet.off("connect", connectListenerDevnet);
@@ -158,7 +139,6 @@ export const tryToConnectSolflare = async (
 
     await Promise.all([
       hasMainnetWallet ? mainnetWallet.connect() : Promise.resolve(),
-      hasTestnetWallet ? testnetWallet.connect() : Promise.resolve(),
       hasDevnetWallet ? devnetWallet.connect() : Promise.resolve(),
     ]);
   });
@@ -189,11 +169,7 @@ export const tryToConnectPhantom = async (
     }
 
     return [StakingNetworkId.Solana]
-      .concat(
-        ENABLE_TESTNETS
-          ? [StakingNetworkId.SolanaTestnet, StakingNetworkId.SolanaDevnet]
-          : [],
-      )
+      .concat(ENABLE_TESTNETS ? [StakingNetworkId.SolanaDevnet] : [])
       .filter((networkId) => solanaNetworks.has(networkId))
       .reduce(async (promise, networkId) => {
         await promise;
@@ -234,12 +210,10 @@ export const tryToConnectPhantom = async (
   }
 };
 
-// In testnet it is not possible to stake less than 1 SOL, Solflare will disable the button.
 // In mainnet less than 0.01 SOL it gives an error from the wallet estimation.
 const minimumStakeAmount: { [key in StakingNetworkId]?: number } = {
   [StakingNetworkId.Solana]: LAMPORTS_PER_SOL * 0.01,
   [StakingNetworkId.SolanaDevnet]: LAMPORTS_PER_SOL * 0.001,
-  [StakingNetworkId.SolanaTestnet]: LAMPORTS_PER_SOL * 1,
 };
 
 type WalletApi = {
@@ -260,7 +234,6 @@ const getWalletApi = (account: Account): WalletApi => {
   const wallet = {
     [StakingNetworkId.Solana]: mainnetWallet,
     [StakingNetworkId.SolanaDevnet]: devnetWallet,
-    [StakingNetworkId.SolanaTestnet]: testnetWallet,
   }[account.networkId as string];
 
   if (!wallet) throw new Error("Unexpected wallet");
@@ -475,7 +448,6 @@ export const disconnectSolflare = async () => {
   (
     [
       [mainnetWallet, connectListenerMainnet],
-      [testnetWallet, connectListenerTestnet],
       [devnetWallet, connectListenerDevnet],
     ] as const
   ).forEach(([wallet, listener]) => {

diff --git a/src/utils/network_info.ts b/src/utils/network_info.ts
@@ -536,15 +536,6 @@ const networks = {
     label: "SolanaDevnet - SOL",
     name: "Solana Devnet",
   },
-  "solana-testnet": {
-    denom: "SOL",
-    graphql: "solana",
-    guide: "how-to-stake-sol-on-solana",
-    image: "/images/network/solana.svg",
-    key: "solana-testnet",
-    label: "SolanaTestnet - SOL",
-    name: "Solana Testnet",
-  },
   "ssv": {
     denom: "SSV",
     graphql: "ssv",
@@ -658,7 +649,7 @@ const cosmosTestNetworkKeys = ENABLE_TESTNETS
   : [];
 
 const solanaTestNetworkKeys = ENABLE_TESTNETS
-  ? (["solana-testnet", "solana-devnet"] satisfies NetworkKey[])
+  ? (["solana-devnet"] satisfies NetworkKey[])
   : [];
 
 export const cosmosNetworkKeys = [