Skip to content

Commit

Permalink
fix: rename llamathena
Browse files Browse the repository at this point in the history
  • Loading branch information
@57Ark
57Ark committed Dec 16, 2024
1 parent e477b7b commit d2533d9
Show file tree
Hide file tree
Showing 10 changed files with 72 additions and 72 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
82 changes: 41 additions & 41 deletions contracts/PriceFeedDataLive.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -3692,81 +3692,81 @@ 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
})
);
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
})
);
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
})
);
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
})
);
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
})
);
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
})
);
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
})
);
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
Expand Down Expand Up @@ -5023,63 +5023,63 @@ contract PriceFeedDataLive {
theSamePriceFeedsByNetwork[1].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[1].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[42161].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[42161].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[10].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[10].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[8453].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[8453].push(
TheSamePriceFeedData({
token: TOKEN_cvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
Expand Down Expand Up @@ -5697,63 +5697,63 @@ contract PriceFeedDataLive {
theSamePriceFeedsByNetwork[1].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[1].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[42161].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[42161].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[10].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[10].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
);
theSamePriceFeedsByNetwork[8453].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: false
})
);
theSamePriceFeedsByNetwork[8453].push(
TheSamePriceFeedData({
token: TOKEN_stkcvxllamathena,
tokenHasSamePriceFeed: TOKEN_scrvUsUSDe,
tokenHasSamePriceFeed: TOKEN_llamathena,
trusted: false,
reserve: true
})
Expand Down
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
Loading

0 comments on commit d2533d9

Please sign in to comment.