Skip to content

Commit a9db520

Browse files
doomsowerdoomsower
committed
fix: update price feed ans adapter contract types
1 parent 91a71c1 commit a9db520

File tree

4 files changed

+88
-38
lines changed

4 files changed

+88
-38
lines changed

‎src/sdk/market/adapters/factory.ts‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,47 +34,47 @@ export function createAdapter(
3434
args.baseParams.contractType as Hex,
3535
) as AdapterContractType;
3636
switch (adapterType) {
37-
case "AD_UNISWAP_V2_ROUTER":
37+
case "ADAPTER::UNISWAP_V2_ROUTER":
3838
return new UniswapV2AdapterContract(sdk, args);
39-
case "AD_UNISWAP_V3_ROUTER":
39+
case "ADAPTER::UNISWAP_V3_ROUTER":
4040
return new UniswapV3AdapterContract(sdk, args);
41-
case "AD_CURVE_V1_2ASSETS":
41+
case "ADAPTER::CURVE_V1_2ASSETS":
4242
return new Curve2AssetsAdapterContract(sdk, args);
43-
case "AD_CURVE_V1_3ASSETS":
43+
case "ADAPTER::CURVE_V1_3ASSETS":
4444
return new Curve3AssetsAdapterContract(sdk, args);
45-
case "AD_CURVE_V1_4ASSETS":
45+
case "ADAPTER::CURVE_V1_4ASSETS":
4646
return new Curve4AssetsAdapterContract(sdk, args);
47-
case "AD_CURVE_V1_STECRV_POOL":
47+
case "ADAPTER::CURVE_V1_STECRV_POOL":
4848
return new CurveV1AdapterStETHContract(sdk, args);
49-
case "AD_CURVE_V1_WRAPPER":
49+
case "ADAPTER::CURVE_V1_WRAPPER":
5050
return new CurveV1AdapterStableNGContract(sdk, args);
51-
case "AD_CONVEX_V1_BASE_REWARD_POOL":
51+
case "ADAPTER::CVX_V1_BASE_REWARD_POOL":
5252
return new ConvexV1BaseRewardPoolAdapterContract(sdk, args);
53-
case "AD_CONVEX_V1_BOOSTER":
53+
case "ADAPTER::CVX_V1_BOOSTER":
5454
return new ConvexV1BoosterAdapterContract(sdk, args);
55-
case "AD_CURVE_STABLE_NG":
55+
case "ADAPTER::CURVE_STABLE_NG":
5656
return new CurveV1StableNGAdapterContract(sdk, args);
57-
case "AD_LIDO_WSTETH_V1":
57+
case "ADAPTER::LIDO_WSTETH_V1":
5858
return new WstETHV1AdapterContract(sdk, args);
59-
case "AD_BALANCER_VAULT":
59+
case "ADAPTER::BALANCER_VAULT":
6060
return new BalancerV2VaultAdapterContract(sdk, args);
61-
case "AD_ERC4626_VAULT":
61+
case "ADAPTER::ERC4626_VAULT":
6262
return new ERC4626AdapterContract(sdk, args);
63-
case "AD_VELODROME_V2_ROUTER":
63+
case "ADAPTER::VELODROME_V2_ROUTER":
6464
return new VelodromeV2RouterAdapterContract(sdk, args);
65-
case "AD_CAMELOT_V3_ROUTER":
65+
case "ADAPTER::CAMELOT_V3_ROUTER":
6666
return new CamelotV3AdapterContract(sdk, args);
67-
case "AD_YEARN_V2":
67+
case "ADAPTER::YEARN_V2":
6868
return new YearnV2RouterAdapterContract(sdk, args);
69-
case "AD_MELLOW_LRT_VAULT":
69+
case "ADAPTER::MELLOW_LRT_VAULT":
7070
return new MellowVaultAdapterContract(sdk, args);
71-
case "AD_MELLOW_ERC4626_VAULT":
71+
case "ADAPTER::MELLOW_ERC4626_VAULT":
7272
return new MellowERC4626VaultAdapterContract(sdk, args);
73-
case "AD_PENDLE_ROUTER":
73+
case "ADAPTER::PENDLE_ROUTER":
7474
return new PendleRouterAdapterContract(sdk, args);
75-
case "AD_DAI_USDS_EXCHANGE":
75+
case "ADAPTER::DAI_USDS_EXCHANGE":
7676
return new DaiUsdsAdapterContract(sdk, args);
77-
case "AD_STAKING_REWARDS":
77+
case "ADAPTER::STAKING_REWARDS":
7878
return new StakingRewardsAdapterContract(sdk, args);
7979
default:
8080
throw new Error(

‎src/sdk/market/adapters/types.ts‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Address } from "viem";
22

33
import type { IBaseContract } from "../../base";
44

5-
export type AdapterContractType =
5+
export type AdapterContractTypeLegacy =
66
| "AD_UNISWAP_V2_ROUTER"
77
| "AD_UNISWAP_V3_ROUTER"
88
| "AD_CURVE_V1_EXCHANGE_ONLY"
@@ -33,6 +33,38 @@ export type AdapterContractType =
3333
| "AD_STAKING_REWARDS"
3434
| "AD_EQUALIZER_ROUTER";
3535

36+
export type AdapterContractType =
37+
| "ADAPTER::UNISWAP_V2_ROUTER"
38+
| "ADAPTER::UNISWAP_V3_ROUTER"
39+
| "ADAPTER::CURVE_V1_EXCHANGE_ONLY"
40+
| "ADAPTER::YEARN_V2"
41+
| "ADAPTER::CURVE_V1_2ASSETS"
42+
| "ADAPTER::CURVE_V1_3ASSETS"
43+
| "ADAPTER::CURVE_V1_4ASSETS"
44+
| "ADAPTER::CURVE_V1_STECRV_POOL"
45+
| "ADAPTER::CURVE_V1_WRAPPER"
46+
| "ADAPTER::CVX_V1_BASE_REWARD_POOL"
47+
| "ADAPTER::CVX_V1_BOOSTER"
48+
| "ADAPTER::LIDO_V1"
49+
| "ADAPTER::LIDO_WSTETH_V1"
50+
| "ADAPTER::BALANCER_VAULT"
51+
| "ADAPTER::BALANCER_V3_ROUTER"
52+
| "ADAPTER::ERC4626_VAULT"
53+
| "ADAPTER::VELODROME_V2_ROUTER"
54+
| "ADAPTER::CURVE_STABLE_NG"
55+
| "ADAPTER::CAMELOT_V3_ROUTER"
56+
| "ADAPTER::CONVEX_L2_BOOSTER"
57+
| "ADAPTER::CONVEX_L2_REWARD_POOL"
58+
| "ADAPTER::AAVE_V3_LENDING_POOL"
59+
| "ADAPTER::ZIRCUIT_POOL"
60+
| "ADAPTER::SYMBIOTIC_DEFAULT_COLLATERAL"
61+
| "ADAPTER::MELLOW_LRT_VAULT"
62+
| "ADAPTER::PENDLE_ROUTER"
63+
| "ADAPTER::MELLOW_ERC4626_VAULT"
64+
| "ADAPTER::DAI_USDS_EXCHANGE"
65+
| "ADAPTER::STAKING_REWARDS"
66+
| "ADAPTER::EQUALIZER_ROUTER";
67+
3668
export interface IAdapterContract extends IBaseContract {
3769
targetContract: Address;
3870
}

‎src/sdk/market/pricefeeds/PriceFeedsRegister.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -241,49 +241,49 @@ export class PriceFeedRegister
241241
) as PriceFeedContractType;
242242

243243
switch (contractType) {
244-
case "PF_CHAINLINK_ORACLE":
244+
case "PRICE_FEED::EXTERNAL":
245245
return new ChainlinkPriceFeedContract(this.sdk, data);
246246

247-
case "PF_YEARN_ORACLE":
247+
case "PRICE_FEED::YEARN":
248248
return new YearnPriceFeedContract(this.sdk, data);
249249

250-
case "PF_CURVE_STABLE_LP_ORACLE":
250+
case "PRICE_FEED::CURVE_STABLE":
251251
return new CurveStablePriceFeedContract(this.sdk, data);
252252

253-
case "PF_WSTETH_ORACLE":
253+
case "PRICE_FEED::WSTETH":
254254
return new WstETHPriceFeedContract(this.sdk, data);
255255

256-
case "PF_BOUNDED_ORACLE":
256+
case "PRICE_FEED::BOUNDED":
257257
return new BoundedPriceFeedContract(this.sdk, data);
258258

259-
case "PF_COMPOSITE_ORACLE":
259+
case "PRICE_FEED::COMPOSITE":
260260
return new CompositePriceFeedContract(this.sdk, data);
261261

262-
case "PF_BALANCER_STABLE_LP_ORACLE":
262+
case "PRICE_FEED::BALANCER_STABLE":
263263
return new BalancerStablePriceFeedContract(this.sdk, data);
264264

265-
case "PF_BALANCER_WEIGHTED_LP_ORACLE":
265+
case "PRICE_FEED::BALANCER_WEIGHTED":
266266
return new BalancerWeightedPriceFeedContract(this.sdk, data);
267267

268-
case "PF_CURVE_CRYPTO_LP_ORACLE":
268+
case "PRICE_FEED::CURVE_CRYPTO":
269269
return new CurveCryptoPriceFeedContract(this.sdk, data);
270270

271-
case "PF_REDSTONE_ORACLE":
271+
case "PRICE_FEED::REDSTONE":
272272
return new RedstonePriceFeedContract(this.sdk, data);
273273

274-
case "PF_ERC4626_ORACLE":
274+
case "PRICE_FEED::ERC4626":
275275
return new Erc4626PriceFeedContract(this.sdk, data);
276276

277-
case "PF_CURVE_USD_ORACLE":
277+
case "PRICE_FEED::CURVE_USD":
278278
return new CurveUSDPriceFeedContract(this.sdk, data);
279279

280-
case "PF_ZERO_ORACLE":
280+
case "PRICE_FEED::ZERO":
281281
return new ZeroPriceFeedContract(this.sdk, data);
282282

283-
case "PF_MELLOW_LRT_ORACLE":
283+
case "PRICE_FEED::MELLOW_LRT":
284284
return new MellowLRTPriceFeedContract(this.sdk, data);
285285

286-
case "PF_PENDLE_PT_TWAP_ORACLE":
286+
case "PRICE_FEED::PENDLE_PT_TWAP":
287287
return new PendleTWAPPTPriceFeed(this.sdk, data);
288288

289289
default:

‎src/sdk/market/pricefeeds/types.ts‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import type { PriceFeedRef } from "./PriceFeedRef";
66

77
export type PriceFeedUsageType = "Main" | "Reserve";
88

9-
export type PriceFeedContractType =
9+
export type PriceFeedContractTypeLegacy =
1010
| "PF_CHAINLINK_ORACLE"
1111
| "PF_ZERO_ORACLE"
1212
| "PF_COMPOSITE_ORACLE"
@@ -24,6 +24,24 @@ export type PriceFeedContractType =
2424
| "PF_REDSTONE_ORACLE"
2525
| "PF_PENDLE_PT_TWAP_ORACLE";
2626

27+
export type PriceFeedContractType =
28+
| "PRICE_FEED::EXTERNAL"
29+
| "PRICE_FEED::ZERO"
30+
| "PRICE_FEED::COMPOSITE"
31+
| "PRICE_FEED::BALANCER_STABLE"
32+
| "PRICE_FEED::CURVE_STABLE"
33+
| "PRICE_FEED::CURVE_CRYPTO"
34+
| "PRICE_FEED::CURVE_USD"
35+
| "PRICE_FEED::ERC4626"
36+
| "PRICE_FEED::WSTETH"
37+
| "PRICE_FEED::YEARN"
38+
| "PRICE_FEED::MELLOW_LRT"
39+
| "PRICE_FEED::BALANCER_WEIGHTED"
40+
| "PRICE_FEED::BOUNDED"
41+
| "PRICE_FEED::PYTH"
42+
| "PRICE_FEED::REDSTONE"
43+
| "PRICE_FEED::PENDLE_PT_TWAP";
44+
2745
export interface IPriceFeedContract extends IBaseContract {
2846
readonly hasLowerBoundCap: boolean;
2947
readonly priceFeedType: PriceFeedContractType;

0 commit comments

Comments
 (0)