Use React context for SolanaConnection

apps/ui/src/components/SolanaTpsWarning.tsx

@@ -3,8 +3,8 @@ import { Env } from "@swim-io/core";
 import type { ReactElement } from "react";
 import { useCallback, useEffect, useState } from "react";
 
+import { useSolanaConnection } from "../contexts/SolanaConnection";
 import { useEnvironment } from "../core/store";
-import { useSolanaConnection } from "../hooks/solana";
 
 const INTERVAL_FREQUENCY_MS = 60000; // 1 minute.
 const SAMPLES_LIMIT = 5;

apps/ui/src/components/SwapForm/SwapForm.test.tsx

@@ -8,12 +8,12 @@ import type { UseQueryResult } from "react-query";
 import { MemoryRouter, Route, Routes } from "react-router";
 
 import { EcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { useEnvironment as environmentStore } from "../../core/store";
 import {
   useErc20BalanceQuery,
   useGetSwapFormErrors,
   useLiquidityQueries,
-  useSolanaConnection,
   useSplTokenAccountsQuery,
   useSplUserBalance,
   useStartNewInteraction,

apps/ui/src/contexts/SolanaConnection.tsx

@@ -0,0 +1,39 @@
+import type { ReactElement, ReactNode } from "react";
+import { createContext, useContext, useMemo } from "react";
+import shallow from "zustand/shallow.js";
+
+import { Protocol } from "../config/ecosystem";
+import { selectConfig } from "../core/selectors";
+import { useEnvironment } from "../core/store";
+import { SolanaConnection } from "../models";
+
+const SolanaConnectionContext: React.Context<null | SolanaConnection> =
+  createContext<null | SolanaConnection>(null);
+
+export const SolanaConnectionProvider = ({
+  children,
+}: {
+  readonly children?: ReactNode;
+}): ReactElement => {
+  const { chains } = useEnvironment(selectConfig, shallow);
+  const [{ endpoints }] = chains[Protocol.Solana];
+
+  const connection = useMemo(
+    () => new SolanaConnection(endpoints),
+    [endpoints],
+  );
+
+  return (
+    <SolanaConnectionContext.Provider value={connection}>
+      {children}
+    </SolanaConnectionContext.Provider>
+  );
+};
+
+export const useSolanaConnection = (): SolanaConnection => {
+  const context = useContext(SolanaConnectionContext);
+  if (!context) {
+    throw new Error("Missing Solana connection context");
+  }
+  return context;
+};

apps/ui/src/contexts/appContext.tsx

@@ -1,7 +1,10 @@
 import type React from "react";
 
+import { SolanaConnectionProvider } from "./SolanaConnection";
 import { QueryClientProvider } from "./queryClient";
 
 export const AppContext: React.FC = ({ children }) => (
-  <QueryClientProvider>{children}</QueryClientProvider>
+  <SolanaConnectionProvider>
+    <QueryClientProvider>{children}</QueryClientProvider>
+  </SolanaConnectionProvider>
 );

apps/ui/src/hooks/interaction/useAddInteractionMutation.ts

@@ -3,6 +3,7 @@ import { useMutation } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { EcosystemId, isEvmEcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment, useInteractionStateV2 } from "../../core/store";
 import type { AddInteractionState } from "../../models";
@@ -13,7 +14,7 @@ import {
   getTokensByPool,
 } from "../../models";
 import { useWallets } from "../crossEcosystem";
-import { useSolanaConnection, useSplTokenAccountsQuery } from "../solana";
+import { useSplTokenAccountsQuery } from "../solana";
 
 export const useAddInteractionMutation = () => {
   const { env } = useEnvironment();

apps/ui/src/hooks/interaction/useFromSolanaTransferMutation.ts

@@ -13,6 +13,7 @@ import {
   getSolanaTokenDetails,
   getTokenDetailsForEcosystem,
 } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig, selectGetInteractionState } from "../../core/selectors";
 import { useEnvironment, useInteractionState } from "../../core/store";
 import type { InteractionState, SolanaConnection, Tx } from "../../models";
@@ -31,11 +32,7 @@ import { DEFAULT_WORMHOLE_RETRIES } from "../../models/wormhole/constants";
 import { getSignedVaaWithRetry } from "../../models/wormhole/guardiansRpc";
 import { useWallets } from "../crossEcosystem";
 import { useEvmConnections } from "../evm";
-import {
-  useSolanaConnection,
-  useSolanaWallet,
-  useSplTokenAccountsQuery,
-} from "../solana";
+import { useSolanaWallet, useSplTokenAccountsQuery } from "../solana";
 
 const getTransferredAmountsByTokenId = async (
   interactionState: InteractionState,

apps/ui/src/hooks/interaction/usePrepareSplTokenAccountMutation.test.ts

@@ -2,14 +2,15 @@ import type { AccountInfo as TokenAccount } from "@solana/spl-token";
 import { act, renderHook } from "@testing-library/react-hooks";
 import { useQueryClient } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectGetInteractionState } from "../../core/selectors";
 import { useInteractionState } from "../../core/store";
 import { MOCK_SOL_WALLET } from "../../fixtures";
 import { MOCK_INTERACTION_STATE } from "../../fixtures/swim/interactionState";
 import type { SolanaWalletInterface } from "../../models";
 import { createSplTokenAccount } from "../../models";
 import { mockOf, renderHookWithAppContext } from "../../testUtils";
-import { useSolanaConnection, useSolanaWallet } from "../solana";
+import { useSolanaWallet } from "../solana";
 
 import { usePrepareSplTokenAccountMutation } from "./usePrepareSplTokenAccountMutation";
 

apps/ui/src/hooks/interaction/usePrepareSplTokenAccountMutation.ts

@@ -1,11 +1,11 @@
 import { useMutation, useQueryClient } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectGetInteractionState } from "../../core/selectors";
 import { useInteractionState } from "../../core/store";
 import { createSplTokenAccount, findTokenAccountForMint } from "../../models";
 import {
   getSplTokenAccountsQueryKey,
-  useSolanaConnection,
   useSolanaWallet,
   useSplTokenAccountsQuery,
 } from "../solana";
@@ -61,7 +61,7 @@ export const usePrepareSplTokenAccountMutation = () => {
         interaction.env,
         solanaAddress,
       );
-      await queryClient.refetchQueries(splTokenAccountsQueryKey);
+      await queryClient.refetchQueries(splTokenAccountsQueryKey, undefined, {});
     }
   });
 };

apps/ui/src/hooks/interaction/useReloadInteractionStateMutation.ts

@@ -3,6 +3,7 @@ import { useMutation, useQueryClient } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { Protocol, getSolanaTokenDetails } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig, selectGetInteractionState } from "../../core/selectors";
 import { useEnvironment, useInteractionState } from "../../core/store";
 import {
@@ -21,11 +22,7 @@ import {
   isUnlockEvmTx,
 } from "../../models";
 import { useEvmConnections, useEvmWallet } from "../evm";
-import {
-  useSolanaConnection,
-  useSolanaWallet,
-  useSplTokenAccountsQuery,
-} from "../solana";
+import { useSolanaWallet, useSplTokenAccountsQuery } from "../solana";
 
 export const useReloadInteractionStateMutation = () => {
   const queryClient = useQueryClient();

apps/ui/src/hooks/interaction/useRemoveInteractionMutation.ts

@@ -3,6 +3,7 @@ import { useMutation } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { EcosystemId, isEvmEcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment, useInteractionStateV2 } from "../../core/store";
 import type { RemoveInteractionState } from "../../models";
@@ -13,7 +14,7 @@ import {
   getTokensByPool,
 } from "../../models";
 import { useWallets } from "../crossEcosystem";
-import { useSolanaConnection, useSplTokenAccountsQuery } from "../solana";
+import { useSplTokenAccountsQuery } from "../solana";
 
 export const useRemoveInteractionMutation = () => {
   const { env } = useEnvironment();

apps/ui/src/hooks/interaction/useSingleChainSolanaSwapInteractionMutation.ts

@@ -4,6 +4,7 @@ import { useMutation } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { EcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment, useInteractionStateV2 } from "../../core/store";
 import type {
@@ -19,7 +20,7 @@ import {
   getTokensByPool,
 } from "../../models";
 import { useWallets } from "../crossEcosystem";
-import { useSolanaConnection, useSplTokenAccountsQuery } from "../solana";
+import { useSplTokenAccountsQuery } from "../solana";
 
 export const useSingleChainSolanaSwapInteractionMutation = () => {
   const { env } = useEnvironment();

apps/ui/src/hooks/interaction/useSolanaPoolOperationsMutation.ts

@@ -3,18 +3,15 @@ import { useMutation } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { EcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig, selectGetInteractionState } from "../../core/selectors";
 import { useEnvironment, useInteractionState } from "../../core/store";
 import {
   doSingleSolanaPoolOperation,
   getTokensByPool,
   setOutputOperationInputAmount,
 } from "../../models";
-import {
-  useSolanaConnection,
-  useSolanaWallet,
-  useSplTokenAccountsQuery,
-} from "../solana";
+import { useSolanaWallet, useSplTokenAccountsQuery } from "../solana";
 
 export const useSolanaPoolOperationsMutation = () => {
   const { env } = useEnvironment();

apps/ui/src/hooks/interaction/useToSolanaTransferMutation.test.ts

@@ -4,6 +4,7 @@ import { act, renderHook } from "@testing-library/react-hooks";
 import { useQueryClient } from "react-query";
 
 import { EcosystemId } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectGetInteractionState } from "../../core/selectors";
 import { useInteractionState } from "../../core/store";
 import { MOCK_SOL_WALLET } from "../../fixtures";
@@ -13,7 +14,7 @@ import type { Wallets } from "../../models";
 import { mockOf, renderHookWithAppContext } from "../../testUtils";
 import { useWallets } from "../crossEcosystem";
 import { useEvmConnections } from "../evm";
-import { useSolanaConnection, useSplTokenAccountsQuery } from "../solana";
+import { useSplTokenAccountsQuery } from "../solana";
 
 import { useToSolanaTransferMutation } from "./useToSolanaTransferMutation";
 

apps/ui/src/hooks/interaction/useToSolanaTransferMutation.ts

@@ -16,6 +16,7 @@ import {
   getSolanaTokenDetails,
   getTokenDetailsForEcosystem,
 } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig, selectGetInteractionState } from "../../core/selectors";
 import { useEnvironment, useInteractionState } from "../../core/store";
 import type { EvmConnection, EvmTx } from "../../models";
@@ -27,7 +28,7 @@ import {
 import { getFromEcosystemOfToSolanaTransfer } from "../../models/swim/transfer";
 import { useWallets } from "../crossEcosystem";
 import { useEvmConnections } from "../evm";
-import { useSolanaConnection, useSplTokenAccountsQuery } from "../solana";
+import { useSplTokenAccountsQuery } from "../solana";
 
 const txResponseToTx = async (
   interactionId: string,

apps/ui/src/hooks/solana/index.ts

@@ -2,7 +2,6 @@ export * from "./useAccountNftsQuery";
 export * from "./useAnchorProvider";
 export * from "./useCreateSplTokenAccountsMutation";
 export * from "./useLiquidityQuery";
-export * from "./useSolanaConnection";
 export * from "./useSolanaWallet";
 export * from "./useSolBalanceQuery";
 export * from "./useSplTokenAccountsQuery";

apps/ui/src/hooks/solana/useAccountNftsQuery.ts

@@ -6,10 +6,10 @@ import { useQuery } from "react-query";
 import shallow from "zustand/shallow.js";
 
 import { Protocol } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment } from "../../core/store";
 
-import { useSolanaConnection } from "./useSolanaConnection";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 const {

apps/ui/src/hooks/solana/useAnchorProvider.ts

@@ -1,6 +1,7 @@
 import { AnchorProvider } from "@project-serum/anchor";
 
-import { useSolanaConnection } from "./useSolanaConnection";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
+
 import { useSolanaWallet } from "./useSolanaWallet";
 
 export const useAnchorProvider = (): AnchorProvider | null => {

apps/ui/src/hooks/solana/useCreateSplTokenAccountsMutation.ts

@@ -2,10 +2,10 @@ import type { AccountInfo as TokenAccount } from "@solana/spl-token";
 import type { UseMutationResult } from "react-query";
 import { useMutation, useQueryClient } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { useEnvironment } from "../../core/store";
 import { findOrCreateSplTokenAccount } from "../../models";
 
-import { useSolanaConnection } from "./useSolanaConnection";
 import { useSolanaWallet } from "./useSolanaWallet";
 import { useSplTokenAccountsQuery } from "./useSplTokenAccountsQuery";
 

apps/ui/src/hooks/solana/useLiquidityQuery.ts

@@ -3,14 +3,13 @@ import { PublicKey } from "@solana/web3.js";
 import type { UseQueryResult } from "react-query";
 import { useQueries, useQuery } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { useEnvironment } from "../../core/store";
 import {
   deserializeTokenAccount,
   getMultipleSolanaAccounts,
 } from "../../models";
 
-import { useSolanaConnection } from "./useSolanaConnection";
-
 export const useLiquidityQuery = (
   tokenAccountAddresses: readonly string[],
 ): UseQueryResult<readonly (TokenAccount | null)[], Error> => {

apps/ui/src/hooks/solana/useSolBalanceQuery.test.ts

@@ -2,10 +2,10 @@ import { LAMPORTS_PER_SOL } from "@solana/web3.js";
 import Decimal from "decimal.js";
 import { useQueryClient } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { mockOf, renderHookWithAppContext } from "../../testUtils";
 
 import { useSolBalanceQuery } from "./useSolBalanceQuery";
-import { useSolanaConnection } from "./useSolanaConnection";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 jest.mock("./useSolanaConnection", () => ({

apps/ui/src/hooks/solana/useSolBalanceQuery.ts

@@ -3,9 +3,9 @@ import Decimal from "decimal.js";
 import type { UseQueryOptions, UseQueryResult } from "react-query";
 import { useQuery } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { useEnvironment } from "../../core/store";
 
-import { useSolanaConnection } from "./useSolanaConnection";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 // Returns user's Solana balance in SOL.

apps/ui/src/hooks/solana/useSplTokenAccountsQuery.ts

@@ -5,10 +5,10 @@ import type { Env } from "@swim-io/core";
 import type { UseQueryOptions, UseQueryResult } from "react-query";
 import { useQuery } from "react-query";
 
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { useEnvironment } from "../../core/store";
 import { deserializeTokenAccount } from "../../models";
 
-import { useSolanaConnection } from "./useSolanaConnection";
 import { useSolanaWallet } from "./useSolanaWallet";
 
 export const getSplTokenAccountsQueryKey = (

apps/ui/src/hooks/swim/usePoolLpMint.ts

@@ -7,10 +7,10 @@ import shallow from "zustand/shallow.js";
 
 import type { PoolSpec } from "../../config";
 import { EcosystemId, getSolanaTokenDetails } from "../../config";
+import { useSolanaConnection } from "../../contexts/SolanaConnection";
 import { selectConfig } from "../../core/selectors";
 import { useEnvironment } from "../../core/store";
 import { deserializeMint } from "../../models";
-import { useSolanaConnection } from "../solana";
 
 export const usePoolLpMints = (
   poolSpecs: readonly PoolSpec[],