Remove rewards field from HyperdriveConfig (#1720)

* Move resolvers to own folder * Add action ids for short and add lp * Cleanup * Pull rewardsMap out of hyperdrive resolvers, Remove rewards field on HyperdriveConfig
delvtech · Jan 8, 2025 · 55faaec · 55faaec
1 parent cf2932c
commit 55faaec
Show file tree

Hide file tree

Showing 24 changed files with 845 additions and 817 deletions.
diff --git a/packages/hyperdrive-appconfig/src/appconfig/AppConfig.ts b/packages/hyperdrive-appconfig/src/appconfig/AppConfig.ts
@@ -1,9 +1,9 @@
 import { Address } from "abitype";
 import { ChainConfig, ChainId } from "src/chains/chains";
 import { HyperdriveConfig } from "src/hyperdrives/HyperdriveConfig";
-import { AnyRewardKey } from "src/hyperdrives/rewards";
 import { protocols } from "src/protocols";
-import { RewardResolverKey } from "src/rewards/rewards";
+import { AnyRewardId } from "src/rewards/actions/types";
+import { RewardResolverKey } from "src/rewards/resolvers";
 import { TokenConfig } from "src/tokens/types";
 import { yieldSources } from "src/yieldSources/yieldSources";
 import { ZapConfig } from "src/zaps/ZapsConfig";
@@ -19,5 +19,5 @@ export interface AppConfig {
   protocols: typeof protocols;
   yieldSources: typeof yieldSources;
   zaps: Record<ChainId, ZapConfig>;
-  rewards: Record<AnyRewardKey, RewardResolverKey[]>;
+  rewards: Record<AnyRewardId, RewardResolverKey[]>;
 }
diff --git a/packages/hyperdrive-appconfig/src/appconfig/HyperdriveConfigResolver.ts b/packages/hyperdrive-appconfig/src/appconfig/HyperdriveConfigResolver.ts
@@ -1,15 +1,15 @@
 import { ReadHyperdrive } from "@delvtech/hyperdrive-viem";
 import { HyperdriveConfig } from "src/hyperdrives/HyperdriveConfig";
-import { AnyRewardKey } from "src/hyperdrives/rewards";
-import { RewardResolverKey } from "src/rewards/rewards";
+import { AnyRewardId } from "src/rewards/actions/types";
+import { RewardResolverKey } from "src/rewards/resolvers";
 import { TokenConfig } from "src/tokens/types";
 import { PublicClient } from "viem";
 
 export interface HyperdriveConfigResolverResult {
   hyperdriveConfig: HyperdriveConfig;
   sharesTokenConfig?: TokenConfig;
   baseTokenConfig?: TokenConfig;
-  rewards?: Record<AnyRewardKey, RewardResolverKey[]>;
+  rewards?: Record<AnyRewardId, RewardResolverKey[]>;
 }
 
 export type HyperdriveConfigResolver = (