From d2533d9bb8c64557af1f25525184cd03bce1be47 Mon Sep 17 00:00:00 2001 From: Arkhip Vouba <80775286+57Ark@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:34:19 +0100 Subject: [PATCH 1/5] fix: rename llamathena --- contracts/AdapterData.sol | 2 +- contracts/PriceFeedDataLive.sol | 82 ++++++++++++++++----------------- contracts/Tokens.sol | 2 +- contracts/TokensData.sol | 4 +- src/contracts/contracts.ts | 12 ++--- src/oracles/priceFeeds.ts | 18 ++++---- src/tokens/convex.ts | 4 +- src/tokens/curveLP.ts | 8 ++-- src/tokens/decimals.ts | 2 +- src/tokens/token.ts | 10 ++-- 10 files changed, 72 insertions(+), 72 deletions(-) diff --git a/contracts/AdapterData.sol b/contracts/AdapterData.sol index fc1e323c..446b7720 100644 --- a/contracts/AdapterData.sol +++ b/contracts/AdapterData.sol @@ -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 }) ); diff --git a/contracts/PriceFeedDataLive.sol b/contracts/PriceFeedDataLive.sol index 94d2652f..8cfd6e24 100644 --- a/contracts/PriceFeedDataLive.sol +++ b/contracts/PriceFeedDataLive.sol @@ -3629,7 +3629,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[1].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: false @@ -3638,7 +3638,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[1].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: true @@ -3647,7 +3647,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[42161].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: false @@ -3656,7 +3656,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[42161].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: true @@ -3665,7 +3665,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[10].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: false @@ -3674,7 +3674,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[10].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: true @@ -3683,7 +3683,7 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[8453].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: false @@ -3692,18 +3692,18 @@ contract PriceFeedDataLive { curvePriceFeedsByNetwork[8453].push( CurvePriceFeedData({ lpToken: TOKEN_crvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_sUSDe), + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_CRVUSD_SUSDE_POOL, trusted: false, reserve: true }) ); - // ------------------------ scrvUsUSDe ------------------------ + // ------------------------ llamathena ------------------------ curvePriceFeedsByNetwork[1].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: false @@ -3711,8 +3711,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[1].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: true @@ -3720,8 +3720,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[42161].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: false @@ -3729,8 +3729,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[42161].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: true @@ -3738,8 +3738,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[10].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: false @@ -3747,8 +3747,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[10].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: true @@ -3756,8 +3756,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[8453].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: false @@ -3765,8 +3765,8 @@ contract PriceFeedDataLive { ); curvePriceFeedsByNetwork[8453].push( CurvePriceFeedData({ - lpToken: TOKEN_scrvUsUSDe, - assets: TokensLib.arrayOf(TOKEN_scrvUSD, TOKEN_sUSDe), + lpToken: TOKEN_llamathena, + assets: TokensLib.arrayOf(TOKEN_crvUSD, TOKEN_USDe), pool: Contracts.CURVE_LLAMA_THENA_POOL, trusted: false, reserve: true @@ -5023,7 +5023,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[1].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5031,7 +5031,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[1].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5039,7 +5039,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[42161].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5047,7 +5047,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[42161].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5055,7 +5055,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[10].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5063,7 +5063,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[10].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5071,7 +5071,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[8453].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5079,7 +5079,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[8453].push( TheSamePriceFeedData({ token: TOKEN_cvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5697,7 +5697,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[1].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5705,7 +5705,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[1].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5713,7 +5713,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[42161].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5721,7 +5721,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[42161].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5729,7 +5729,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[10].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5737,7 +5737,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[10].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) @@ -5745,7 +5745,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[8453].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: false }) @@ -5753,7 +5753,7 @@ contract PriceFeedDataLive { theSamePriceFeedsByNetwork[8453].push( TheSamePriceFeedData({ token: TOKEN_stkcvxllamathena, - tokenHasSamePriceFeed: TOKEN_scrvUsUSDe, + tokenHasSamePriceFeed: TOKEN_llamathena, trusted: false, reserve: true }) diff --git a/contracts/Tokens.sol b/contracts/Tokens.sol index 991e7e03..54c85ae0 100644 --- a/contracts/Tokens.sol +++ b/contracts/Tokens.sol @@ -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; diff --git a/contracts/TokensData.sol b/contracts/TokensData.sol index e8992d73..e0708762 100644 --- a/contracts/TokensData.sol +++ b/contracts/TokensData.sol @@ -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 }) ); diff --git a/src/contracts/contracts.ts b/src/contracts/contracts.ts index f7261d21..f877230f 100644 --- a/src/contracts/contracts.ts +++ b/src/contracts/contracts.ts @@ -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", @@ -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, @@ -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, @@ -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, @@ -1312,11 +1312,11 @@ export const contractParams: Record = { 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"], }, diff --git a/src/oracles/priceFeeds.ts b/src/oracles/priceFeeds.ts index 9c3cad38..a398d00c 100644 --- a/src/oracles/priceFeeds.ts +++ b/src/oracles/priceFeeds.ts @@ -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"], }, }, }, @@ -2530,12 +2530,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", }, }, }, @@ -2702,12 +2702,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", }, }, }, diff --git a/src/tokens/convex.ts b/src/tokens/convex.ts index 7b040839..97ec4795 100644 --- a/src/tokens/convex.ts +++ b/src/tokens/convex.ts @@ -283,7 +283,7 @@ export const convexLpTokens: Record = { }, pool: "CONVEX_LLAMA_THENA_POOL", pid: 401, - underlying: "scrvUsUSDe", + underlying: "llamathena", stakedToken: "stkcvxllamathena", }, }; @@ -501,7 +501,7 @@ export const convexStakedPhantomTokens: Record< }, pool: "CONVEX_LLAMA_THENA_POOL", pid: 401, - underlying: "scrvUsUSDe", + underlying: "llamathena", lpToken: "cvxllamathena", }, }; diff --git a/src/tokens/curveLP.ts b/src/tokens/curveLP.ts index 550adad4..0d86c6f1 100644 --- a/src/tokens/curveLP.ts +++ b/src/tokens/curveLP.ts @@ -42,7 +42,7 @@ export type CurveLPToken = | "DOLAFRAXBP3CRV_f" | "crvUSDDOLA_f" | "crvUsUSDe" - | "scrvUsUSDe" + | "llamathena" /// Arbitrum | "2CRV" @@ -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"], diff --git a/src/tokens/decimals.ts b/src/tokens/decimals.ts index 1ad3cb49..a87e5d6b 100644 --- a/src/tokens/decimals.ts +++ b/src/tokens/decimals.ts @@ -87,7 +87,7 @@ export const decimals: Record = { crvUSD: 18, crvUSDUSDC: 18, crvUsUSDe: 18, - scrvUsUSDe: 18, + llamathena: 18, crvUSDUSDT: 18, crvUSDETHCRV: 18, crvUSDFRAX: 18, diff --git a/src/tokens/token.ts b/src/tokens/token.ts index e973ae95..758af5e6 100644 --- a/src/tokens/token.ts +++ b/src/tokens/token.ts @@ -252,7 +252,7 @@ export const tokenDataByNetwork: Record< crvUSDFRAX: "0x0CD6f267b2086bea681E922E19D40512511BE538", crvUSDETHCRV: "0x4eBdF703948ddCEA3B11f675B4D1Fba9d2414A14", crvUsUSDe: "0x57064F49Ad7123C92560882a45518374ad982e85", - scrvUsUSDe: "0xd29f8980852c2c76fC3f6E96a7Aa06E0BedCC1B1", + llamathena: "0xd29f8980852c2c76fC3f6E96a7Aa06E0BedCC1B1", rETH_f: "0x6c38cE8984a890F5e46e6dF6117C26b3F1EcfC9C", MtEthena: "0x167478921b907422F8E88B43C4Af2B8BEa278d3A", @@ -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", @@ -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, @@ -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, @@ -1538,7 +1538,7 @@ export const tickerInfoTokensByNetwork: Record< reserve: true, }, ], - scrvUsUSDe: [ + llamathena: [ { symbol: "crvUSD", dataId: "crvUSD", From 6ab00938e381a02f42d93d5ab365e2557d244138 Mon Sep 17 00:00:00 2001 From: Arkhip Vouba <80775286+57Ark@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:25:35 +0100 Subject: [PATCH 2/5] fix: dola pool --- src/config/configs/dolaConfigMainnet.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/config/configs/dolaConfigMainnet.ts b/src/config/configs/dolaConfigMainnet.ts index aaf0ddcd..8712d5be 100644 --- a/src/config/configs/dolaConfigMainnet.ts +++ b/src/config/configs/dolaConfigMainnet.ts @@ -110,7 +110,6 @@ const tier1CreditManager: CreditManagerV3DeployConfig = { { token: "USDecrvUSD", lt: 0 }, { token: "FRAXsDAI", lt: 0 }, { token: "steCRV", lt: 0 }, - { token: "DOLAFRAXBP3CRV_f", lt: 0 }, { token: "crvUSDDOLA_f", lt: 0 }, ], adapters: [ @@ -295,12 +294,6 @@ export const dolaConfigMainnet: PoolV3DeployConfig = { quotaIncreaseFee: 0, limit: BigInt(0), }, - DOLAFRAXBP3CRV_f: { - minRate: 1, - maxRate: 1, - quotaIncreaseFee: 0, - limit: BigInt(0), - }, crvUSDDOLA_f: { minRate: 1, maxRate: 1, From 2924ebdc86a1d8e00413d00c94425968096500c2 Mon Sep 17 00:00:00 2001 From: Arkhip Vouba <80775286+57Ark@users.noreply.github.com> Date: Tue, 17 Dec 2024 17:35:24 +0100 Subject: [PATCH 3/5] fix: dola pool --- contracts/PriceFeedDataLive.sol | 40 +++++-------------------- src/config/configs/dolaConfigMainnet.ts | 7 +++++ src/oracles/priceFeeds.ts | 3 +- 3 files changed, 16 insertions(+), 34 deletions(-) diff --git a/contracts/PriceFeedDataLive.sol b/contracts/PriceFeedDataLive.sol index 8cfd6e24..3b722171 100644 --- a/contracts/PriceFeedDataLive.sol +++ b/contracts/PriceFeedDataLive.sol @@ -3976,41 +3976,17 @@ contract PriceFeedDataLive { ); // ------------------------ DOLAFRAXBP3CRV_f ------------------------ - curveCryptoPriceFeedsByNetwork[1].push( - CurvePriceFeedData({ - lpToken: TOKEN_DOLAFRAXBP3CRV_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvFRAX), - pool: Contracts.CURVE_DOLA_FRAXBP_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[1].push( + SingeTokenPriceFeedData({token: TOKEN_DOLAFRAXBP3CRV_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[42161].push( - CurvePriceFeedData({ - lpToken: TOKEN_DOLAFRAXBP3CRV_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvFRAX), - pool: Contracts.CURVE_DOLA_FRAXBP_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[42161].push( + SingeTokenPriceFeedData({token: TOKEN_DOLAFRAXBP3CRV_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[10].push( - CurvePriceFeedData({ - lpToken: TOKEN_DOLAFRAXBP3CRV_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvFRAX), - pool: Contracts.CURVE_DOLA_FRAXBP_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[10].push( + SingeTokenPriceFeedData({token: TOKEN_DOLAFRAXBP3CRV_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[8453].push( - CurvePriceFeedData({ - lpToken: TOKEN_DOLAFRAXBP3CRV_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvFRAX), - pool: Contracts.CURVE_DOLA_FRAXBP_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[8453].push( + SingeTokenPriceFeedData({token: TOKEN_DOLAFRAXBP3CRV_f, trusted: false, reserve: false}) ); // ------------------------ crvUSDDOLA_f ------------------------ diff --git a/src/config/configs/dolaConfigMainnet.ts b/src/config/configs/dolaConfigMainnet.ts index 8712d5be..aaf0ddcd 100644 --- a/src/config/configs/dolaConfigMainnet.ts +++ b/src/config/configs/dolaConfigMainnet.ts @@ -110,6 +110,7 @@ const tier1CreditManager: CreditManagerV3DeployConfig = { { token: "USDecrvUSD", lt: 0 }, { token: "FRAXsDAI", lt: 0 }, { token: "steCRV", lt: 0 }, + { token: "DOLAFRAXBP3CRV_f", lt: 0 }, { token: "crvUSDDOLA_f", lt: 0 }, ], adapters: [ @@ -294,6 +295,12 @@ export const dolaConfigMainnet: PoolV3DeployConfig = { quotaIncreaseFee: 0, limit: BigInt(0), }, + DOLAFRAXBP3CRV_f: { + minRate: 1, + maxRate: 1, + quotaIncreaseFee: 0, + limit: BigInt(0), + }, crvUSDDOLA_f: { minRate: 1, maxRate: 1, diff --git a/src/oracles/priceFeeds.ts b/src/oracles/priceFeeds.ts index a398d00c..b488e76a 100644 --- a/src/oracles/priceFeeds.ts +++ b/src/oracles/priceFeeds.ts @@ -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, }, }, From ecf825a2ab480af8ad5231aaff687ece74ef728e Mon Sep 17 00:00:00 2001 From: Arkhip Vouba <80775286+57Ark@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:28:05 +0100 Subject: [PATCH 4/5] fix: crvUSDDOLA_f fedd --- contracts/PriceFeedDataLive.sol | 40 +++++++-------------------------- src/oracles/priceFeeds.ts | 3 +-- 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/contracts/PriceFeedDataLive.sol b/contracts/PriceFeedDataLive.sol index 3b722171..40636b12 100644 --- a/contracts/PriceFeedDataLive.sol +++ b/contracts/PriceFeedDataLive.sol @@ -3990,41 +3990,17 @@ contract PriceFeedDataLive { ); // ------------------------ crvUSDDOLA_f ------------------------ - curveCryptoPriceFeedsByNetwork[1].push( - CurvePriceFeedData({ - lpToken: TOKEN_crvUSDDOLA_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvUSD), - pool: Contracts.CURVE_DOLA_CRVUSD_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[1].push( + SingeTokenPriceFeedData({token: TOKEN_crvUSDDOLA_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[42161].push( - CurvePriceFeedData({ - lpToken: TOKEN_crvUSDDOLA_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvUSD), - pool: Contracts.CURVE_DOLA_CRVUSD_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[42161].push( + SingeTokenPriceFeedData({token: TOKEN_crvUSDDOLA_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[10].push( - CurvePriceFeedData({ - lpToken: TOKEN_crvUSDDOLA_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvUSD), - pool: Contracts.CURVE_DOLA_CRVUSD_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[10].push( + SingeTokenPriceFeedData({token: TOKEN_crvUSDDOLA_f, trusted: false, reserve: false}) ); - curveCryptoPriceFeedsByNetwork[8453].push( - CurvePriceFeedData({ - lpToken: TOKEN_crvUSDDOLA_f, - assets: TokensLib.arrayOf(TOKEN_DOLA, TOKEN_crvUSD), - pool: Contracts.CURVE_DOLA_CRVUSD_POOL, - trusted: false, - reserve: false - }) + zeroPriceFeedsByNetwork[8453].push( + SingeTokenPriceFeedData({token: TOKEN_crvUSDDOLA_f, trusted: false, reserve: false}) ); // ------------------------ pufETHwstE ------------------------ diff --git a/src/oracles/priceFeeds.ts b/src/oracles/priceFeeds.ts index b488e76a..2b1dbbc8 100644 --- a/src/oracles/priceFeeds.ts +++ b/src/oracles/priceFeeds.ts @@ -2208,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, }, }, From c7b0a40e126baf4cdd6cf4f3a767dbbcfacbe002 Mon Sep 17 00:00:00 2001 From: Arkhip Vouba <80775286+57Ark@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:53:20 +0100 Subject: [PATCH 5/5] fix: router protocols update --- src/router/components.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/router/components.ts b/src/router/components.ts index fd6e3b36..6d740a18 100644 --- a/src/router/components.ts +++ b/src/router/components.ts @@ -19,6 +19,7 @@ export enum RouterProtocols { Pendle, DaiUsdsSwap, SKY, + LlamaThena, } export enum RouterComponent {