Unify names and arguments for appconfig selectors

apps/hyperdrive-trading/src/hyperdrive/getLpApy.ts

@@ -2,8 +2,8 @@
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   appConfig,
-  findYieldSource,
   getRewardsFn,
+  getYieldSource,
   HyperdriveConfig,
 } from "@delvtech/hyperdrive-appconfig";
 import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
@@ -50,7 +50,7 @@
   const currentBlock = (await readHyperdrive.drift.getBlock()) as Block;
   const currentBlockNumber = currentBlock.blockNumber!;
   // Appconfig tells us how many days to look back for historical rates
-  const yieldSource = findYieldSource({
+  const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdrive.address,
     hyperdriveChainId: hyperdrive.chainId,
     appConfig,
@@ -80,7 +80,7 @@
     });
     lpApy = lpApyResult.lpApy;
     netLpApy = lpApy;
     const publicClient = getPublicClient(wagmiConfig as any, {
       chainId: hyperdrive.chainId,
     }) as PublicClient;
     const rewardsFn = getRewardsFn({

apps/hyperdrive-trading/src/hyperdrive/getYieldSourceRate.ts

@@ -2,9 +2,9 @@
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   AppConfig,
-  findHyperdriveConfig,
-  findYieldSource,
+  getHyperdriveConfig,
   getRewardsFn,
+  getYieldSource,
   HyperdriveConfig,
 } from "@delvtech/hyperdrive-appconfig";
 import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
@@ -19,10 +19,10 @@
   appConfig: AppConfig,
 ): Promise<{ rate: bigint; ratePeriodDays: number; netRate: bigint }> {
   const hyperdriveChainId = await readHyperdrive.drift.getChainId();
-  const hyperdrive = findHyperdriveConfig({
+  const hyperdrive = getHyperdriveConfig({
     hyperdriveChainId,
     hyperdriveAddress: readHyperdrive.address,
-    hyperdrives: appConfig.hyperdrives,
+    appConfig,
   });
 
   const numBlocksForHistoricalRate = getNumBlocksForHistoricalRate({
@@ -67,10 +67,10 @@
 
   const netRate = await calcNetRate(rate, appConfig, hyperdrive);
 
-  const yieldSource = findYieldSource({
-    appConfig,
+  const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdrive.address,
     hyperdriveChainId: hyperdrive.chainId,
+    appConfig,
   });
 
   return {
@@ -91,7 +91,7 @@
     appConfig,
   });
   if (rewardsFn) {
     const publicClient = getPublicClient(wagmiConfig as any, {
       chainId: hyperdrive.chainId,
     }) as PublicClient;
     const rewards = await rewardsFn(publicClient);
@@ -115,7 +115,7 @@
   hyperdrive: HyperdriveConfig;
 }) {
   const blocksPerDay = appConfig.chains[hyperdrive.chainId].dailyAverageBlocks;
-  const yieldSource = findYieldSource({
+  const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdrive.address,
     hyperdriveChainId: hyperdrive.chainId,
     appConfig,

apps/hyperdrive-trading/src/token/getTokenFiatPrice.ts

@@ -1,5 +1,5 @@
 import { parseFixed } from "@delvtech/fixed-point-wasm";
-import { appConfig, findToken } from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getToken } from "@delvtech/hyperdrive-appconfig";
 import { fetchCoinGeckoPrice } from "src/token/coingecko";
 import { ETH_MAGIC_NUMBER } from "src/token/ETH_MAGIC_NUMBER";
 import { Address } from "viem";
@@ -26,10 +26,10 @@ export async function getTokenFiatPrice({
   let price = data?.coins?.[defiLlamaTokenId]?.price;
   if (price === undefined) {
     // fallback to coingecko if defillama is not available
-    const tokenConfig = findToken({
+    const tokenConfig = getToken({
       chainId,
       tokenAddress,
-      tokens: appConfig.tokens,
+      appConfig,
     });
     price = await fetchCoinGeckoPrice(tokenConfig!.symbol);
   }

apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/TransactionsTable.tsx

@@ -3,7 +3,7 @@ import {
   AppConfig,
   HyperdriveConfig,
   appConfig,
-  findBaseToken,
+  getBaseToken,
   makeAddressUrl,
   makeTransactionUrl,
 } from "@delvtech/hyperdrive-appconfig";
@@ -182,7 +182,7 @@ export function TransactionTable({
 }
 
 function getColumns(hyperdrive: HyperdriveConfig, appConfig: AppConfig) {
-  const baseToken = findBaseToken({
+  const baseToken = getBaseToken({
     hyperdriveChainId: hyperdrive.chainId,
     hyperdriveAddress: hyperdrive.address,
     appConfig,
@@ -305,7 +305,7 @@ function formatTransactionTableMobileData(
   hyperdrive: HyperdriveConfig,
   appConfig: AppConfig,
 ) {
-  const baseToken = findBaseToken({
+  const baseToken = getBaseToken({
     hyperdriveChainId: hyperdrive.chainId,
     hyperdriveAddress: hyperdrive.address,
     appConfig,

apps/hyperdrive-trading/src/ui/hyperdrive/TransactionTable/useTransactionData.ts

@@ -1,7 +1,4 @@
-import {
-  appConfig,
-  findHyperdriveConfig,
-} from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getHyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
 import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
 import { makeQueryKey } from "src/base/makeQueryKey";
@@ -37,10 +34,10 @@ export function useTransactionData({
     address: hyperdriveAddress,
   });
 
-  const { decimals } = findHyperdriveConfig({
+  const { decimals } = getHyperdriveConfig({
     hyperdriveAddress,
     hyperdriveChainId: chainId,
-    hyperdrives: appConfig.hyperdrives,
+    appConfig,
   });
 
   const { data: longs, status: longEventsStatus } = useQuery({

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/useLpApy.ts

@@ -1,7 +1,4 @@
-import {
-  appConfig,
-  findHyperdriveConfig,
-} from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getHyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
 import { useQuery } from "@tanstack/react-query";
 import { makeQueryKey } from "src/base/makeQueryKey";
 import { getLpApy, LpApyResult } from "src/hyperdrive/getLpApy";
@@ -25,10 +22,10 @@ export function useLpApy({
     chainId,
   });
 
-  const hyperdrive = findHyperdriveConfig({
+  const hyperdrive = getHyperdriveConfig({
     hyperdriveChainId: chainId,
     hyperdriveAddress,
-    hyperdrives: appConfig.hyperdrives,
+    appConfig,
   });
 
   const { data: blockNumber } = useBlockNumber({ chainId });

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/usePrepareSharesIn.ts

@@ -1,8 +1,8 @@
 import {
   AppConfig,
   appConfig,
-  findHyperdriveConfig,
-  findYieldSource,
+  getHyperdriveConfig,
+  getYieldSource,
 } from "@delvtech/hyperdrive-appconfig";
 import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
 import { useQuery } from "@tanstack/react-query";
@@ -67,16 +67,16 @@ export async function prepareSharesIn({
   sharesAmount: bigint;
   readHyperdrive: ReadHyperdrive;
 }): Promise<bigint> {
-  const hyperdriveConfig = findHyperdriveConfig({
+  const hyperdriveConfig = getHyperdriveConfig({
     hyperdriveChainId: chainId,
-    hyperdrives: appConfig.hyperdrives,
     hyperdriveAddress: readHyperdrive.address,
+    appConfig,
   });
 
   // If the shares token is pegged to its base token (e.g., stETH to ETH), then
   // we need to treat the amount as if it were base. To get the actual shares
   // amount then, we convert to the shares used by the pool (eg: lidoShares).
-  const yieldSource = findYieldSource({
+  const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdriveConfig.address,
     hyperdriveChainId: hyperdriveConfig.chainId,
     appConfig,

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/usePrepareSharesOut.ts

@@ -1,8 +1,8 @@
 import {
   AppConfig,
   appConfig,
-  findHyperdriveConfig,
-  findYieldSource,
+  getHyperdriveConfig,
+  getYieldSource,
 } from "@delvtech/hyperdrive-appconfig";
 import { ReadHyperdrive } from "@delvtech/hyperdrive-js";
 import { useQuery } from "@tanstack/react-query";
@@ -71,18 +71,18 @@ export async function prepareSharesOut({
     return sharesAmount;
   }
 
-  const hyperdriveConfig = findHyperdriveConfig({
+  const hyperdriveConfig = getHyperdriveConfig({
     hyperdriveChainId: chainId,
-    hyperdrives: appConfig.hyperdrives,
     hyperdriveAddress: readHyperdrive.address,
+    appConfig,
   });
 
   // If the shares token is pegged to its base token (e.g., stETH to ETH), then
   // we need to treat the shares amount out as base. To get the actual shares
   // amount then, we convert to base. For example, when preparing lido shares
   // received back from a steth hyperdrive, this will convert lido shares to
   // eth, and since 1 eth = 1 steth we return this as the shares value.
-  const yieldSource = findYieldSource({
+  const yieldSource = getYieldSource({
     hyperdriveAddress: hyperdriveConfig.address,
     hyperdriveChainId: hyperdriveConfig.chainId,
     appConfig,

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/useReadHyperdrive.ts

@@ -1,7 +1,4 @@
-import {
-  appConfig,
-  findHyperdriveConfig,
-} from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getHyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
 import { getHyperdrive, ReadHyperdrive } from "@delvtech/hyperdrive-js";
 import { useQuery } from "@tanstack/react-query";
 import { makeQueryKey } from "src/base/makeQueryKey";
@@ -26,10 +23,10 @@ export function useReadHyperdrive({
     enabled,
     queryFn: enabled
       ? () => {
-          const { initializationBlock } = findHyperdriveConfig({
+          const { initializationBlock } = getHyperdriveConfig({
             hyperdriveAddress: address,
             hyperdriveChainId: chainId,
-            hyperdrives: appConfig.hyperdrives,
+            appConfig,
           });
           return getHyperdrive({
             address,

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/useReadWriteHyperdrive.ts

@@ -1,7 +1,4 @@
-import {
-  appConfig,
-  findHyperdriveConfig,
-} from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getHyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
 import { getHyperdrive, ReadWriteHyperdrive } from "@delvtech/hyperdrive-js";
 import { useQuery } from "@tanstack/react-query";
 import { makeQueryKey } from "src/base/makeQueryKey";
@@ -27,10 +24,10 @@ export function useReadWriteHyperdrive({
     enabled,
     queryFn: enabled
       ? () => {
-          const { initializationBlock } = findHyperdriveConfig({
+          const { initializationBlock } = getHyperdriveConfig({
             hyperdriveAddress: address,
             hyperdriveChainId: chainId,
-            hyperdrives: appConfig.hyperdrives,
+            appConfig,
           });
           return getHyperdrive({
             address,

apps/hyperdrive-trading/src/ui/hyperdrive/hooks/useTradingVolume.ts

@@ -1,7 +1,4 @@
-import {
-  appConfig,
-  findHyperdriveConfig,
-} from "@delvtech/hyperdrive-appconfig";
+import { appConfig, getHyperdriveConfig } from "@delvtech/hyperdrive-appconfig";
 import { useQuery } from "@tanstack/react-query";
 import { makeQueryKey } from "src/base/makeQueryKey";
 import { useReadHyperdrive } from "src/ui/hyperdrive/hooks/useReadHyperdrive";
@@ -17,10 +14,10 @@ export function useTradingVolume(
   shortVolume: bigint | undefined;
   tradingVolumeStatus: "loading" | "error" | "success";
 } {
-  const hyperdrive = findHyperdriveConfig({
+  const hyperdrive = getHyperdriveConfig({
     hyperdriveChainId: chainId,
     hyperdriveAddress,
-    hyperdrives: appConfig.hyperdrives,
+    appConfig,
   });
   const readHyperdrive = useReadHyperdrive({
     chainId,

apps/hyperdrive-trading/src/ui/hyperdrive/longs/CloseLongForm/CloseLongForm.tsx

@@ -1,8 +1,8 @@
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   appConfig,
-  findBaseToken,
-  findToken,
+  getBaseToken,
+  getToken,
   HyperdriveConfig,
   TokenConfig,
 } from "@delvtech/hyperdrive-appconfig";
@@ -40,7 +40,7 @@ export function CloseLongForm({
   const { address: account } = useAccount();
 
   const defaultItems: TokenConfig[] = [];
-  const baseToken = findBaseToken({
+  const baseToken = getBaseToken({
     hyperdriveAddress: hyperdrive.address,
     hyperdriveChainId: hyperdrive.chainId,
     appConfig,
@@ -49,10 +49,10 @@ export function CloseLongForm({
     defaultItems.push(baseToken);
   }
 
-  const sharesToken = findToken({
+  const sharesToken = getToken({
     chainId: hyperdrive.chainId,
     tokenAddress: hyperdrive.poolConfig.vaultSharesToken,
-    tokens: appConfig.tokens,
+    appConfig,
   });
   if (hyperdrive.withdrawOptions.isShareTokenWithdrawalEnabled) {
     // Safe to cast: sharesToken must be defined if its enabled for withdrawal

apps/hyperdrive-trading/src/ui/hyperdrive/longs/CloseLongModalButton/CloseLongModalButton.tsx

@@ -2,8 +2,8 @@ import {
   HyperdriveConfig,
   TokenConfig,
   appConfig,
-  findBaseToken,
-  findToken,
+  getBaseToken,
+  getToken,
 } from "@delvtech/hyperdrive-appconfig";
 import { Long } from "@delvtech/hyperdrive-js";
 import { ReactElement } from "react";
@@ -21,15 +21,15 @@ export function CloseLongModalButton({
   long,
   hyperdrive,
 }: CloseLongModalButtonProps): ReactElement {
-  const baseToken = findBaseToken({
+  const baseToken = getBaseToken({
     hyperdriveChainId: hyperdrive.chainId,
     hyperdriveAddress: hyperdrive.address,
     appConfig,
   });
-  const sharesToken = findToken({
+  const sharesToken = getToken({
     chainId: hyperdrive.chainId,
     tokenAddress: hyperdrive.poolConfig.vaultSharesToken,
-    tokens: appConfig.tokens,
+    appConfig,
   });
 
   const subHeading = sharesToken

apps/hyperdrive-trading/src/ui/hyperdrive/longs/OpenLongForm/OpenLongForm.tsx

@@ -1,8 +1,8 @@
 import { fixed } from "@delvtech/fixed-point-wasm";
 import {
   appConfig,
-  findBaseToken,
-  findToken,
+  getBaseToken,
+  getToken,
   HyperdriveConfig,
 } from "@delvtech/hyperdrive-appconfig";
 import { adjustAmountByPercentage } from "@delvtech/hyperdrive-js";
@@ -71,7 +71,7 @@ export function OpenLongForm({
     hyperdriveAddress: hyperdrive.address,
     chainId: hyperdrive.chainId,
   });
-  const baseToken = findBaseToken({
+  const baseToken = getBaseToken({
     hyperdriveChainId: hyperdrive.chainId,
     hyperdriveAddress: hyperdrive.address,
     appConfig,
@@ -97,10 +97,10 @@ export function OpenLongForm({
     });
   }
 
-  const sharesToken = findToken({
+  const sharesToken = getToken({
     chainId: hyperdrive.chainId,
-    tokens: appConfig.tokens,
     tokenAddress: hyperdrive.poolConfig.vaultSharesToken,
+    appConfig,
   });
 
   if (sharesToken && hyperdrive.depositOptions.isShareTokenDepositsEnabled) {