Pull rewardsMap out of hyperdrive resolvers, Remove rewards field on …

…HyperdriveConfig
delvtech · Jan 8, 2025 · d3c74f2 · d3c74f2
1 parent 6dd9429
commit d3c74f2
Show file tree

Hide file tree

Showing 11 changed files with 768 additions and 743 deletions.
diff --git a/packages/hyperdrive-appconfig/src/appconfig/getAppConfig.ts b/packages/hyperdrive-appconfig/src/appconfig/getAppConfig.ts
diff --git a/packages/hyperdrive-appconfig/src/generated/all.appconfig.ts b/packages/hyperdrive-appconfig/src/generated/all.appconfig.ts
diff --git a/packages/hyperdrive-appconfig/src/generated/mainnet.appconfig.ts b/packages/hyperdrive-appconfig/src/generated/mainnet.appconfig.ts
diff --git a/packages/hyperdrive-appconfig/src/generated/testnet.appconfig.ts b/packages/hyperdrive-appconfig/src/generated/testnet.appconfig.ts
diff --git a/packages/hyperdrive-appconfig/src/hyperdrives/HyperdriveConfig.ts b/packages/hyperdrive-appconfig/src/hyperdrives/HyperdriveConfig.ts
@@ -1,5 +1,4 @@
 import { PoolConfig } from "@delvtech/hyperdrive-viem";
-import { RewardResolverKey } from "src/rewards/resolvers";
 import { YieldSourceId } from "src/yieldSources/types";
 import { Address } from "viem";
 
@@ -41,15 +40,6 @@ export interface HyperdriveConfig {
     isShareTokenWithdrawalEnabled?: boolean;
   };
 
-  /**
-   * @deprecated use rewards system on top-level instead
-   */
-  rewards?: {
-    long?: RewardResolverKey[];
-    short?: RewardResolverKey[];
-    lp?: RewardResolverKey[];
-  };
-
   poolConfig: PoolConfig;
 
   /**

diff --git a/packages/hyperdrive-appconfig/src/hyperdrives/aero/getAeroHyperdrive.ts b/packages/hyperdrive-appconfig/src/hyperdrives/aero/getAeroHyperdrive.ts
@@ -1,12 +1,8 @@
 import { ReadHyperdrive } from "@delvtech/hyperdrive-viem";
-import { HyperdriveConfigResolverResult } from "src/appconfig/HyperdriveConfigResolver";
 import { HyperdriveConfig } from "src/hyperdrives/HyperdriveConfig";
 import { formatHyperdriveName } from "src/hyperdrives/formatHyperdriveName";
-import {
-  HyperdriveRewardsMap,
-  parseHyperdriveRewardsMap,
-} from "src/hyperdrives/rewards";
 import { getTokenConfig } from "src/tokens/getTokenConfig";
+import { TokenConfig } from "src/tokens/types";
 import { YieldSourceId } from "src/yieldSources/types";
 import { yieldSources } from "src/yieldSources/yieldSources";
 
@@ -16,15 +12,16 @@ export async function getAeroLpHyperdrive({
   baseTokenTags,
   baseTokenIconUrl,
   baseTokenPlaces,
-  rewardsMap,
 }: {
   hyperdrive: ReadHyperdrive;
   yieldSourceId: YieldSourceId;
   baseTokenTags: string[];
   baseTokenIconUrl: string;
   baseTokenPlaces: number;
-  rewardsMap?: HyperdriveRewardsMap;
-}): Promise<HyperdriveConfigResolverResult> {
+}): Promise<{
+  baseTokenConfig: TokenConfig;
+  hyperdriveConfig: HyperdriveConfig;
+}> {
   const version = await hyperdrive.getVersion();
   const poolConfig = await hyperdrive.getPoolConfig();
 
@@ -67,17 +64,8 @@ export async function getAeroLpHyperdrive({
     poolConfig,
   };
 
-  const rewards = rewardsMap
-    ? parseHyperdriveRewardsMap({
-        hyperdriveAddress: hyperdrive.address,
-        chainId,
-        rewardsMap,
-      })
-    : undefined;
-
   return {
     baseTokenConfig,
     hyperdriveConfig,
-    rewards,
   };
 }
diff --git a/packages/hyperdrive-appconfig/src/hyperdrives/custom/getCustomHyperdrive.ts b/packages/hyperdrive-appconfig/src/hyperdrives/custom/getCustomHyperdrive.ts
@@ -1,12 +1,8 @@
 import { ReadHyperdrive } from "@delvtech/hyperdrive-viem";
-import { HyperdriveConfigResolverResult } from "src/appconfig/HyperdriveConfigResolver";
 import { HyperdriveConfig } from "src/hyperdrives/HyperdriveConfig";
 import { formatHyperdriveName } from "src/hyperdrives/formatHyperdriveName";
-import {
-  HyperdriveRewardsMap,
-  parseHyperdriveRewardsMap,
-} from "src/hyperdrives/rewards";
 import { getTokenConfig } from "src/tokens/getTokenConfig";
+import { TokenConfig } from "src/tokens/types";
 import { yieldSources } from "src/yieldSources/yieldSources";
 
 type DepositOptions = HyperdriveConfig["depositOptions"];
@@ -23,7 +19,6 @@ interface GetHyperdriveConfigParams {
   tokenPlaces: number;
   sharesTokenTags?: string[];
   baseTokenTags?: string[];
-  rewardsMap?: HyperdriveRewardsMap;
 }
 
 export async function getCustomHyperdrive({
@@ -37,8 +32,11 @@ export async function getCustomHyperdrive({
   tokenPlaces,
   sharesTokenTags = [],
   baseTokenTags = [],
-  rewardsMap,
-}: GetHyperdriveConfigParams): Promise<HyperdriveConfigResolverResult> {
+}: GetHyperdriveConfigParams): Promise<{
+  sharesTokenConfig: TokenConfig;
+  baseTokenConfig: TokenConfig;
+  hyperdriveConfig: HyperdriveConfig;
+}> {
   const version = await hyperdrive.getVersion();
   const poolConfig = await hyperdrive.getPoolConfig();
   const sharesToken = await hyperdrive.getSharesToken();
@@ -85,18 +83,9 @@ export async function getCustomHyperdrive({
     poolConfig,
   };
 
-  const rewards = rewardsMap
-    ? parseHyperdriveRewardsMap({
-        hyperdriveAddress: hyperdrive.address,
-        chainId,
-        rewardsMap,
-      })
-    : {};
-
   return {
     sharesTokenConfig,
     baseTokenConfig,
     hyperdriveConfig,
-    rewards,
   };
 }
diff --git a/packages/hyperdrive-appconfig/src/hyperdrives/morpho/getMorphoHyperdrive.ts b/packages/hyperdrive-appconfig/src/hyperdrives/morpho/getMorphoHyperdrive.ts
@@ -1,13 +1,9 @@
 import { ReadHyperdrive } from "@delvtech/hyperdrive-viem";
 import retry from "p-retry";
-import { HyperdriveConfigResolverResult } from "src/appconfig/HyperdriveConfigResolver";
 import { HyperdriveConfig } from "src/hyperdrives/HyperdriveConfig";
 import { formatHyperdriveName } from "src/hyperdrives/formatHyperdriveName";
-import {
-  HyperdriveRewardsMap,
-  parseHyperdriveRewardsMap,
-} from "src/hyperdrives/rewards";
 import { getTokenConfig } from "src/tokens/getTokenConfig";
+import { TokenConfig } from "src/tokens/types";
 import { YieldSourceId } from "src/yieldSources/types";
 import { yieldSources } from "src/yieldSources/yieldSources";
 
@@ -17,15 +13,16 @@ export async function getMorphoHyperdrive({
   baseTokenTags,
   baseTokenIconUrl,
   baseTokenPlaces,
-  rewardsMap,
 }: {
   hyperdrive: ReadHyperdrive;
   yieldSourceId: YieldSourceId;
   baseTokenTags: string[];
   baseTokenIconUrl: string;
   baseTokenPlaces: number;
-  rewardsMap?: HyperdriveRewardsMap;
-}): Promise<HyperdriveConfigResolverResult> {
+}): Promise<{
+  baseTokenConfig: TokenConfig;
+  hyperdriveConfig: HyperdriveConfig;
+}> {
   const version = await hyperdrive.getVersion();
   const poolConfig = await hyperdrive.getPoolConfig();
 
@@ -80,17 +77,8 @@ export async function getMorphoHyperdrive({
     poolConfig,
   };
 
-  const rewards = rewardsMap
-    ? parseHyperdriveRewardsMap({
-        hyperdriveAddress: hyperdrive.address,
-        chainId,
-        rewardsMap,
-      })
-    : undefined;
-
   return {
     baseTokenConfig,
     hyperdriveConfig,
-    rewards,
   };
 }
diff --git a/packages/hyperdrive-appconfig/src/hyperdrives/rewards.ts b/packages/hyperdrive-appconfig/src/hyperdrives/rewards.ts
@@ -1,5 +1,5 @@
-import { makeAddLiquidityRewardId } from "src/rewards/actions/lp";
-import { makeOpenShortRewardId } from "src/rewards/actions/short";
+import { getAddLiquidityRewardId } from "src/rewards/actions/lp";
+import { getOpenShortRewardId } from "src/rewards/actions/short";
 import { AnyRewardId } from "src/rewards/actions/types";
 import { RewardResolverKey } from "src/rewards/resolvers";
 import { Address } from "viem";
@@ -27,11 +27,11 @@ export function parseHyperdriveRewardsMap({
 }): Record<AnyRewardId, RewardResolverKey[]> {
   const rewards: Record<AnyRewardId, RewardResolverKey[]> = {};
   rewardsMap?.short?.forEach((reward) => {
-    const key = makeOpenShortRewardId({ hyperdriveAddress, chainId });
+    const key = getOpenShortRewardId({ hyperdriveAddress, chainId });
     rewards[key] = [...(rewards[key] || []), reward];
   });
   rewardsMap?.lp?.forEach((reward) => {
-    const key = makeAddLiquidityRewardId({ hyperdriveAddress, chainId });
+    const key = getAddLiquidityRewardId({ hyperdriveAddress, chainId });
     rewards[key] = [...(rewards[key] || []), reward];
   });
   return rewards;

diff --git a/packages/hyperdrive-appconfig/src/rewards/actions/lp.ts b/packages/hyperdrive-appconfig/src/rewards/actions/lp.ts
@@ -6,7 +6,7 @@ import { Address } from "viem";
 export type AddLiquidityRewardId =
   `hyperdrive:add-liquidity:${number}:${Address}`;
 
-export function makeAddLiquidityRewardId({
+export function getAddLiquidityRewardId({
   chainId,
   hyperdriveAddress,
 }: {

diff --git a/packages/hyperdrive-appconfig/src/rewards/actions/short.ts b/packages/hyperdrive-appconfig/src/rewards/actions/short.ts
@@ -5,7 +5,7 @@ import { Address } from "viem";
  */
 export type OpenShortRewardId = `hyperdrive:open-short:${number}:${Address}`;
 
-export function makeOpenShortRewardId({
+export function getOpenShortRewardId({
   chainId,
   hyperdriveAddress,
 }: {