refactor: migrate src root to core/utils (coinbase#1709)

Author: dschlabach

src/OnchainKitProvider.test.tsx

@@ -6,8 +6,9 @@ import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 import { http, WagmiProvider, createConfig } from 'wagmi';
 import { useConfig } from 'wagmi';
 import { mock } from 'wagmi/connectors';
-import { setOnchainKitConfig } from './OnchainKitConfig';
+
 import { OnchainKitProvider } from './OnchainKitProvider';
+import { setOnchainKitConfig } from './core/OnchainKitConfig';
 import type { EASSchemaUid } from './identity/types';
 import { useOnchainKit } from './useOnchainKit';
 import { useProviderDependencies } from './useProviderDependencies';
@@ -57,7 +58,7 @@ const TestComponent = () => {
   );
 };
 
-vi.mock('./OnchainKitConfig', () => ({
+vi.mock('./core/OnchainKitConfig', () => ({
   setOnchainKitConfig: vi.fn(),
   ONCHAIN_KIT_CONFIG: {
     address: null,

src/OnchainKitProvider.tsx

@@ -1,12 +1,16 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { createContext, useMemo } from 'react';
 import { WagmiProvider } from 'wagmi';
-import { ONCHAIN_KIT_CONFIG, setOnchainKitConfig } from './OnchainKitConfig';
-import { DEFAULT_PRIVACY_URL, DEFAULT_TERMS_URL } from './constants';
+import type { OnchainKitProviderReact } from './core-react/types';
+import {
+  ONCHAIN_KIT_CONFIG,
+  setOnchainKitConfig,
+} from './core/OnchainKitConfig';
+import { DEFAULT_PRIVACY_URL, DEFAULT_TERMS_URL } from './core/constants';
+import { createWagmiConfig } from './core/createWagmiConfig';
+import type { OnchainKitContextType } from './core/types';
 import { checkHashLength } from './core/utils/checkHashLength';
-import { createWagmiConfig } from './createWagmiConfig';
 import { COINBASE_VERIFIED_ACCOUNT_SCHEMA_ID } from './identity/constants';
-import type { OnchainKitContextType, OnchainKitProviderReact } from './types';
 import { useProviderDependencies } from './useProviderDependencies';
 
 export const OnchainKitContext =

src/core-react/internal/hooks/useCapabilitiesSafe.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import type { WalletCapabilities } from 'viem';
 import { useAccount } from 'wagmi';
 import { useCapabilities } from 'wagmi/experimental';
-import type { UseCapabilitiesSafeParams } from '../../../types';
+import type { UseCapabilitiesSafeParams } from '../../../core/types';
 
 export function useCapabilitiesSafe({
   chainId,

src/core-react/types.ts

@@ -0,0 +1,19 @@
+import type { ReactNode } from 'react';
+import type { Address } from 'viem';
+import type { Chain } from 'wagmi/chains';
+import type { AppConfig } from '../core/types';
+import type { EASSchemaUid } from '../identity/types';
+
+/**
+ * Note: exported as public Type
+ */
+export type OnchainKitProviderReact = {
+  address?: Address;
+  apiKey?: string;
+  chain: Chain;
+  children: ReactNode;
+  config?: AppConfig;
+  rpcUrl?: string;
+  schemaId?: EASSchemaUid;
+  projectId?: string;
+};

src/OnchainKitConfig.test.ts src/core/OnchainKitConfig.test.ts

@@ -1,7 +1,7 @@
 import { baseSepolia } from 'viem/chains';
 import { describe, expect, it } from 'vitest';
 import { getOnchainKitConfig, setOnchainKitConfig } from './OnchainKitConfig';
-import { getRPCUrl } from './core/network/getRPCUrl';
+import { getRPCUrl } from './network/getRPCUrl';
 
 describe('OnchainKitConfig', () => {
   it('should have a get function to access the config', () => {

src/OnchainKitConfig.ts src/core/OnchainKitConfig.ts

@@ -1,9 +1,6 @@
 import { baseSepolia } from 'viem/chains';
 import { describe, expect, it } from 'vitest';
-import {
-  getOnchainKitConfig,
-  setOnchainKitConfig,
-} from '../../OnchainKitConfig';
+import { getOnchainKitConfig, setOnchainKitConfig } from '../OnchainKitConfig';
 import { getRPCUrl } from './getRPCUrl';
 
 describe('OnchainKitConfig RPC URL', () => {

src/constants.ts src/core/constants.ts

@@ -1,4 +1,4 @@
-import { ONCHAIN_KIT_CONFIG } from '../../OnchainKitConfig';
+import { ONCHAIN_KIT_CONFIG } from '../OnchainKitConfig';
 
 /**
  * Access the RPC URL for OnchainKit.

src/createWagmiConfig.test.ts src/core/createWagmiConfig.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
 import { version } from '../../version';
+import { setOnchainKitConfig } from '../OnchainKitConfig';
 import { buildRequestBody, sendRequest } from './request';
 
 describe('request', () => {

src/createWagmiConfig.ts src/core/createWagmiConfig.ts

@@ -1,6 +1,5 @@
-import type { ReactNode } from 'react';
 import type { Address, Chain } from 'viem';
-import type { EASSchemaUid } from './identity/types';
+import type { EASSchemaUid } from '../identity/types';
 
 /**
  * Note: exported as public Type
@@ -82,20 +81,6 @@ export type SetOnchainKitConfig = Partial<OnchainKitConfig>;
  */
 export type OnchainKitContextType = OnchainKitConfig;
 
-/**
- * Note: exported as public Type
- */
-export type OnchainKitProviderReact = {
-  address?: Address;
-  apiKey?: string;
-  chain: Chain;
-  children: ReactNode;
-  config?: AppConfig;
-  rpcUrl?: string;
-  schemaId?: EASSchemaUid;
-  projectId?: string;
-};
-
 export type UseCapabilitiesSafeParams = {
   chainId: number;
 };

src/core/network/getRPCUrl.test.ts

@@ -1,5 +1,5 @@
 import { base, baseSepolia } from 'viem/chains';
-import type { isBaseOptions } from './types';
+import type { isBaseOptions } from '../types';
 
 /**
  * isBase

src/core/network/getRPCUrl.ts

@@ -1,5 +1,5 @@
 import { mainnet, sepolia } from 'viem/chains';
-import type { isEthereumOptions } from './types';
+import type { isEthereumOptions } from '../types';
 
 /**
  * isEthereum

src/core/network/request.test.ts

@@ -1,5 +1,5 @@
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
 import { ONRAMP_API_BASE_URL } from '../constants';
 import { fetchOnrampConfig } from './fetchOnrampConfig';
 

src/types.ts src/core/types.ts

@@ -7,7 +7,7 @@ import {
   it,
   vi,
 } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
 import { ONRAMP_API_BASE_URL } from '../constants';
 import { fetchOnrampOptions } from './fetchOnrampOptions';
 

src/isBase.test.ts src/core/utils/isBase.test.ts

@@ -1,5 +1,5 @@
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
 import { ONRAMP_API_BASE_URL } from '../constants';
 import { fetchOnrampQuote } from './fetchOnrampQuote';
 

src/isBase.ts src/core/utils/isBase.ts

@@ -1,5 +1,5 @@
 import { type Mock, beforeEach, describe, expect, it, vi } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
 import { ONRAMP_API_BASE_URL } from '../constants';
 import { fetchOnrampTransactionStatus } from './fetchOnrampTransactionStatus';
 

src/isEthereum.test.ts src/core/utils/isEthereum.test.ts

@@ -1,8 +1,8 @@
 import { mainnet } from 'viem/chains';
 import { normalize } from 'viem/ens';
 import { getChainPublicClient } from '../../core/network/getChainPublicClient';
-import { isBase } from '../../isBase';
-import { isEthereum } from '../../isEthereum';
+import { isBase } from '../../core/utils/isBase';
+import { isEthereum } from '../../core/utils/isEthereum';
 import { RESOLVER_ADDRESSES_BY_CHAIN_ID } from '../constants';
 import type { Basename, GetAvatar, GetAvatarReturnType } from '../types';
 import { getBaseDefaultProfilePicture } from './getBaseDefaultProfilePicture';

src/isEthereum.ts src/core/utils/isEthereum.ts

@@ -1,7 +1,7 @@
 import { base, mainnet } from 'viem/chains';
 import { getChainPublicClient } from '../../core/network/getChainPublicClient';
-import { isBase } from '../../isBase';
-import { isEthereum } from '../../isEthereum';
+import { isBase } from '../../core/utils/isBase';
+import { isEthereum } from '../../core/utils/isEthereum';
 import L2ResolverAbi from '../abis/L2ResolverAbi';
 import { RESOLVER_ADDRESSES_BY_CHAIN_ID } from '../constants';
 import type { Basename, GetName, GetNameReturnType } from '../types';

src/fund/utils/fetchOnrampConfig.test.ts

@@ -1,12 +1,12 @@
 import { base, mainnet } from 'viem/chains';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { getChainPublicClient } from '../../core/network/getChainPublicClient';
-import { isBase } from '../../isBase';
-import { isEthereum } from '../../isEthereum';
+import { isBase } from '../../core/utils/isBase';
+import { isEthereum } from '../../core/utils/isEthereum';
 import { getSocials } from './getSocials';
 
-vi.mock('../../isBase');
-vi.mock('../../isEthereum');
+vi.mock('../../core/utils/isBase');
+vi.mock('../../core/utils/isEthereum');
 vi.mock('../../core/network/getChainPublicClient');
 
 describe('getSocials', () => {

src/fund/utils/fetchOnrampOptions.test.ts

@@ -2,8 +2,8 @@ import type { Chain } from 'viem';
 import { mainnet } from 'viem/chains';
 import { normalize } from 'viem/ens';
 import { getChainPublicClient } from '../../core/network/getChainPublicClient';
-import { isBase } from '../../isBase';
-import { isEthereum } from '../../isEthereum';
+import { isBase } from '../../core/utils/isBase';
+import { isEthereum } from '../../core/utils/isEthereum';
 import { RESOLVER_ADDRESSES_BY_CHAIN_ID } from '../constants';
 import type { GetSocialsReturnType } from '../types';
 

src/fund/utils/fetchOnrampQuote.test.ts

@@ -1,7 +1,10 @@
 // 🌲☀️🌲
-export { isBase } from './isBase';
-export { isEthereum } from './isEthereum';
-export { getOnchainKitConfig, setOnchainKitConfig } from './OnchainKitConfig';
+export { isBase } from './core/utils/isBase';
+export { isEthereum } from './core/utils/isEthereum';
+export {
+  getOnchainKitConfig,
+  setOnchainKitConfig,
+} from './core/OnchainKitConfig';
 export { OnchainKitProvider } from './OnchainKitProvider';
 export { useOnchainKit } from './useOnchainKit';
 export { version } from './version';
@@ -11,5 +14,6 @@ export type {
   isEthereumOptions,
   OnchainKitConfig,
   OnchainKitContextType,
-  OnchainKitProviderReact,
-} from './types';
+} from './core/types';
+
+export type { OnchainKitProviderReact } from './core-react/types';

src/fund/utils/fetchOnrampTransactionStatus.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
 import { getApiKey } from './getApiKey';
 
 describe('getApiKey', () => {

src/identity/utils/getAvatar.ts

@@ -1,4 +1,4 @@
-import { ONCHAIN_KIT_CONFIG } from '../../OnchainKitConfig';
+import { ONCHAIN_KIT_CONFIG } from '../../core/OnchainKitConfig';
 
 /**
  * Get the API key for OnchainKit.

src/identity/utils/getName.ts

@@ -3,7 +3,6 @@ import { useValue } from '../../core-react/internal/hooks/useValue';
 import { getRoundedAmount } from '../../core/utils/getRoundedAmount';
 import { isValidAmount } from '../../core/utils/isValidAmount';
 import { TextInput } from '../../internal/components/TextInput';
-
 import {
   background,
   border,

src/identity/utils/getSocials.test.ts

@@ -2,8 +2,9 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { http, createConfig } from 'wagmi';
 import { base } from 'wagmi/chains';
 import { mock } from 'wagmi/connectors';
-import type { BuildSwapTransaction } from '../../api/types';
-import { Capabilities } from '../../constants';
+
+import type { BuildSwapTransaction } from '../../core/api/types';
+import { Capabilities } from '../../core/constants';
 import { PERMIT2_CONTRACT_ADDRESS } from '../constants';
 import { DEGEN_TOKEN, ETH_TOKEN, USDC_TOKEN } from '../mocks';
 import { processSwapTransaction } from './processSwapTransaction';

src/identity/utils/getSocials.ts

@@ -3,8 +3,8 @@ import { http, createConfig } from 'wagmi';
 import { waitForTransactionReceipt } from 'wagmi/actions';
 import { mainnet, sepolia } from 'wagmi/chains';
 import { mock } from 'wagmi/connectors';
-import { setOnchainKitConfig } from '../../OnchainKitConfig';
-import { Capabilities } from '../../constants';
+import { setOnchainKitConfig } from '../../core/OnchainKitConfig';
+import { Capabilities } from '../../core/constants';
 import type { SwapTransaction } from '../types';
 import { sendSwapTransactions } from './sendSwapTransactions';
 

src/index.ts

@@ -1,4 +1,4 @@
-import { Capabilities } from '../../constants';
+import { Capabilities } from '../../core/constants';
 import type { SendSwapTransactionParams } from '../types';
 import { sendSingleTransactions } from './sendSingleTransactions';
 

src/internal/utils/getApiKey.test.ts

@@ -14,9 +14,9 @@ import {
   useWaitForTransactionReceipt,
 } from 'wagmi';
 import { waitForTransactionReceipt } from 'wagmi/actions';
-import { Capabilities } from '../../constants';
 import { useCapabilitiesSafe } from '../../core-react/internal/hooks/useCapabilitiesSafe';
 import { useValue } from '../../core-react/internal/hooks/useValue';
+import { Capabilities } from '../../core/constants';
 import { useOnchainKit } from '../../useOnchainKit';
 import { GENERIC_ERROR_MESSAGE } from '../constants';
 import { useCallsStatus } from '../hooks/useCallsStatus';

src/internal/utils/getApiKey.ts

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import type { ContractFunctionParameters } from 'viem';
-import { Capabilities } from '../../constants';
+import { Capabilities } from '../../core/constants';
 import type { Call, UseSendWalletTransactionsParams } from '../types';
 import { sendBatchedTransactions } from '../utils/sendBatchedTransactions';
 import { sendSingleTransactions } from '../utils/sendSingleTransactions';

src/swap/components/SwapAmountInput.tsx

@@ -1,7 +1,7 @@
 import '@testing-library/jest-dom';
 import { render } from '@testing-library/react';
 import { describe, expect, it } from 'vitest';
-import { setOnchainKitConfig } from './OnchainKitConfig';
+import { setOnchainKitConfig } from './core/OnchainKitConfig';
 import { useOnchainKit } from './useOnchainKit';
 
 const TestComponent = () => {

src/swap/utils/processSwapTransaction.test.ts

@@ -1,5 +1,5 @@
 import { usePreferredColorScheme } from './core-react/internal/hooks/usePreferredColorScheme';
-import type { UseThemeReact } from './types';
+import type { UseThemeReact } from './core/types';
 import { useOnchainKit } from './useOnchainKit';
 
 export function useTheme(): UseThemeReact {