Skip to content

Commit

Permalink
Merge pull request #209 from Gearbox-protocol/next
Browse files Browse the repository at this point in the history
  • Loading branch information
@57Ark
57Ark authored Dec 18, 2024
2 parents 4129c37 + c7b0a40 commit 31ff2e8
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 140 deletions.
2 changes: 1 addition & 1 deletion contracts/AdapterData.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ contract AdapterData {
CurveAdapter({
targetContract: Contracts.CURVE_LLAMA_THENA_POOL,
adapterType: AdapterType.CURVE_STABLE_NG,
lpToken: TOKEN_scrvUsUSDe,
lpToken: TOKEN_llamathena,
basePool: Contracts.NO_CONTRACT
})
);
Expand Down
162 changes: 57 additions & 105 deletions contracts/PriceFeedDataLive.sol
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion contracts/Tokens.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ uint256 constant TOKEN_LDOETH = 80;
uint256 constant TOKEN_crvUSDUSDC = 81;
uint256 constant TOKEN_crvUSDUSDT = 82;
uint256 constant TOKEN_crvUsUSDe = 83;
uint256 constant TOKEN_scrvUsUSDe = 84;
uint256 constant TOKEN_llamathena = 84;
uint256 constant TOKEN_crvUSDFRAX = 85;
uint256 constant TOKEN_crvUSDETHCRV = 86;
uint256 constant TOKEN_rETH_f = 87;
Expand Down
4 changes: 2 additions & 2 deletions contracts/TokensData.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,9 @@ contract TokensDataLive {
);
tokenDataByNetwork[1].push(
TokenData({
id: TOKEN_scrvUsUSDe,
id: TOKEN_llamathena,
addr: 0xd29f8980852c2c76fC3f6E96a7Aa06E0BedCC1B1,
symbol: "scrvUsUSDe",
symbol: "llamathena",
tokenType: TokenType.CURVE_LP_TOKEN
})
);
Expand Down
12 changes: 6 additions & 6 deletions src/contracts/contracts.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ export const contractsByNetwork: Record<
CURVE_CRVUSD_FRAX_POOL: tokenDataByNetwork.Mainnet.crvUSDFRAX,
CURVE_TRI_CRV_POOL: tokenDataByNetwork.Mainnet.crvUSDETHCRV,
CURVE_CRVUSD_SUSDE_POOL: tokenDataByNetwork.Mainnet.crvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Mainnet.scrvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Mainnet.llamathena,

CURVE_RETH_ETH_POOL: "0x0f3159811670c117c372428D4E69AC32325e4D0F",

Expand Down Expand Up @@ -398,7 +398,7 @@ export const contractsByNetwork: Record<
CURVE_CRVUSD_FRAX_POOL: tokenDataByNetwork.Arbitrum.crvUSDFRAX,
CURVE_TRI_CRV_POOL: tokenDataByNetwork.Arbitrum.crvUSDETHCRV,
CURVE_CRVUSD_SUSDE_POOL: tokenDataByNetwork.Arbitrum.crvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Arbitrum.scrvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Arbitrum.llamathena,

CURVE_RETH_ETH_POOL: NOT_DEPLOYED,
CURVE_3CRV_POOL_OP: NOT_DEPLOYED,
Expand Down Expand Up @@ -567,7 +567,7 @@ export const contractsByNetwork: Record<
CURVE_CRVUSD_FRAX_POOL: tokenDataByNetwork.Optimism.crvUSDFRAX,
CURVE_TRI_CRV_POOL: tokenDataByNetwork.Optimism.crvUSDETHCRV,
CURVE_CRVUSD_SUSDE_POOL: tokenDataByNetwork.Optimism.crvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Optimism.scrvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Optimism.llamathena,

CURVE_RETH_ETH_POOL: NOT_DEPLOYED,

Expand Down Expand Up @@ -735,7 +735,7 @@ export const contractsByNetwork: Record<
CURVE_CRVUSD_FRAX_POOL: tokenDataByNetwork.Base.crvUSDFRAX,
CURVE_TRI_CRV_POOL: tokenDataByNetwork.Base.crvUSDETHCRV,
CURVE_CRVUSD_SUSDE_POOL: tokenDataByNetwork.Base.crvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Base.scrvUsUSDe,
CURVE_LLAMA_THENA_POOL: tokenDataByNetwork.Base.llamathena,

CURVE_RETH_ETH_POOL: NOT_DEPLOYED,

Expand Down Expand Up @@ -1312,11 +1312,11 @@ export const contractParams: Record<SupportedContract, ContractParams> = {
tokens: ["crvUSD", "sUSDe"],
},
CURVE_LLAMA_THENA_POOL: {
name: "Curve scrvUsUSDe",
name: "Curve llamathena",
protocol: Protocols.Curve,
version: 10,
type: AdapterInterface.CURVE_STABLE_NG,
lpToken: "scrvUsUSDe",
lpToken: "llamathena",
tokens: ["scrvUSD", "sUSDe"],
},

Expand Down
24 changes: 11 additions & 13 deletions src/oracles/priceFeeds.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2124,25 +2124,25 @@ export const priceFeedsByToken: Record<
AllNetworks: {
Main: {
type: PriceFeedType.CURVE_2LP_ORACLE,
assets: ["crvUSD", "sUSDe"],
assets: ["crvUSD", "USDe"],
trusted: false,
},
Reserve: {
type: PriceFeedType.CURVE_2LP_ORACLE,
assets: ["crvUSD", "sUSDe"],
assets: ["crvUSD", "USDe"],
},
},
},
scrvUsUSDe: {
llamathena: {
AllNetworks: {
Main: {
type: PriceFeedType.CURVE_2LP_ORACLE,
assets: ["scrvUSD", "sUSDe"],
assets: ["crvUSD", "USDe"],
trusted: false,
},
Reserve: {
type: PriceFeedType.CURVE_2LP_ORACLE,
assets: ["scrvUSD", "sUSDe"],
assets: ["crvUSD", "USDe"],
},
},
},
Expand Down Expand Up @@ -2199,8 +2199,7 @@ export const priceFeedsByToken: Record<
DOLAFRAXBP3CRV_f: {
AllNetworks: {
Main: {
type: PriceFeedType.CURVE_CRYPTO_ORACLE,
assets: ["DOLA", "crvFRAX"],
type: PriceFeedType.ZERO_ORACLE,
trusted: false,
},
},
Expand All @@ -2209,8 +2208,7 @@ export const priceFeedsByToken: Record<
crvUSDDOLA_f: {
AllNetworks: {
Main: {
type: PriceFeedType.CURVE_CRYPTO_ORACLE,
assets: ["DOLA", "crvUSD"],
type: PriceFeedType.ZERO_ORACLE,
trusted: false,
},
},
Expand Down Expand Up @@ -2530,12 +2528,12 @@ export const priceFeedsByToken: Record<
AllNetworks: {
Main: {
type: PriceFeedType.THE_SAME_AS,
token: "scrvUsUSDe",
token: "llamathena",
trusted: false,
},
Reserve: {
type: PriceFeedType.THE_SAME_AS,
token: "scrvUsUSDe",
token: "llamathena",
},
},
},
Expand Down Expand Up @@ -2702,12 +2700,12 @@ export const priceFeedsByToken: Record<
AllNetworks: {
Main: {
type: PriceFeedType.THE_SAME_AS,
token: "scrvUsUSDe",
token: "llamathena",
trusted: false,
},
Reserve: {
type: PriceFeedType.THE_SAME_AS,
token: "scrvUsUSDe",
token: "llamathena",
},
},
},
Expand Down
3 changes: 3 additions & 0 deletions src/router/components.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export enum RouterProtocols {
Pendle,
DaiUsdsSwap,
SKY,
LlamaThena,
}

export enum RouterComponent {
Expand Down Expand Up @@ -65,4 +66,6 @@ export enum RouterComponent {
RC_STAKING_REWARDS_WITHDRAWER = 40,
RC_STAKING_REWARDS_PATH_RESOLVER = 41,
RC_PT_SUSDE_OVERRIDER = 42,
RC_EQUALIZER_SWAPPER = 43,
RC_CONVEX_LLAMATHENA_OVERRIDER = 44,
}
4 changes: 2 additions & 2 deletions src/tokens/convex.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ export const convexLpTokens: Record<ConvexLPToken, ConvexLPTokenData> = {
},
pool: "CONVEX_LLAMA_THENA_POOL",
pid: 401,
underlying: "scrvUsUSDe",
underlying: "llamathena",
stakedToken: "stkcvxllamathena",
},
};
Expand Down Expand Up @@ -501,7 +501,7 @@ export const convexStakedPhantomTokens: Record<
},
pool: "CONVEX_LLAMA_THENA_POOL",
pid: 401,
underlying: "scrvUsUSDe",
underlying: "llamathena",
lpToken: "cvxllamathena",
},
};
Expand Down
8 changes: 4 additions & 4 deletions src/tokens/curveLP.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export type CurveLPToken =
| "DOLAFRAXBP3CRV_f"
| "crvUSDDOLA_f"
| "crvUsUSDe"
| "scrvUsUSDe"
| "llamathena"

/// Arbitrum
| "2CRV"
Expand Down Expand Up @@ -196,9 +196,9 @@ export const curveTokens: Record<
tokenOut: ["crvUSD", "sUSDe"],
},

scrvUsUSDe: {
name: "Curve scrvUsUSDe",
symbol: "scrvUsUSDe",
llamathena: {
name: "Curve llamathena",
symbol: "llamathena",
type: { AllNetworks: TokenType.CURVE_LP_TOKEN },
pool: "CURVE_LLAMA_THENA_POOL",
tokenOut: ["scrvUSD", "sUSDe"],
Expand Down
2 changes: 1 addition & 1 deletion src/tokens/decimals.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const decimals: Record<SupportedToken, number> = {
crvUSD: 18,
crvUSDUSDC: 18,
crvUsUSDe: 18,
scrvUsUSDe: 18,
llamathena: 18,
crvUSDUSDT: 18,
crvUSDETHCRV: 18,
crvUSDFRAX: 18,
Expand Down
10 changes: 5 additions & 5 deletions src/tokens/token.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ export const tokenDataByNetwork: Record<
crvUSDFRAX: "0x0CD6f267b2086bea681E922E19D40512511BE538",
crvUSDETHCRV: "0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14",
crvUsUSDe: "0x57064F49Ad7123C92560882a45518374ad982e85",
scrvUsUSDe: "0xd29f8980852c2c76fC3f6E96a7Aa06E0BedCC1B1",
llamathena: "0xd29f8980852c2c76fC3f6E96a7Aa06E0BedCC1B1",

rETH_f: "0x6c38cE8984a890F5e46e6dF6117C26b3F1EcfC9C",
MtEthena: "0x167478921b907422F8E88B43C4Af2B8BEa278d3A",
Expand Down Expand Up @@ -571,7 +571,7 @@ export const tokenDataByNetwork: Record<
crvUSDFRAX: "0x2FE7AE43591E534C256A1594D326e5779E302Ff4",
crvUSDETHCRV: NOT_DEPLOYED,
crvUsUSDe: NOT_DEPLOYED,
scrvUsUSDe: NOT_DEPLOYED,
llamathena: NOT_DEPLOYED,
crvUSDC: "0xec090cf6DD891D2d014beA6edAda6e05E025D93d",
crvUSDT: "0x73aF1150F265419Ef8a5DB41908B700C32D49135",
crvUSDC_e: "0x3aDf984c937FA6846E5a24E0A68521Bdaf767cE1",
Expand Down Expand Up @@ -879,7 +879,7 @@ export const tokenDataByNetwork: Record<
crvUSDFRAX: NOT_DEPLOYED,
crvUSDETHCRV: NOT_DEPLOYED,
crvUsUSDe: NOT_DEPLOYED,
scrvUsUSDe: NOT_DEPLOYED,
llamathena: NOT_DEPLOYED,

"2CRV": NOT_DEPLOYED,
"3c-crvUSD": NOT_DEPLOYED,
Expand Down Expand Up @@ -1186,7 +1186,7 @@ export const tokenDataByNetwork: Record<
crvUSDFRAX: NOT_DEPLOYED,
crvUSDETHCRV: NOT_DEPLOYED,
crvUsUSDe: NOT_DEPLOYED,
scrvUsUSDe: NOT_DEPLOYED,
llamathena: NOT_DEPLOYED,

"2CRV": NOT_DEPLOYED,
"3c-crvUSD": NOT_DEPLOYED,
Expand Down Expand Up @@ -1538,7 +1538,7 @@ export const tickerInfoTokensByNetwork: Record<
reserve: true,
},
],
scrvUsUSDe: [
llamathena: [
{
symbol: "crvUSD",
dataId: "crvUSD",
Expand Down

0 comments on commit 31ff2e8

Please sign in to comment.