Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix sfrxETH Collateral, add new oracle #1026

Merged
merged 11 commits into from
Jan 20, 2024
Merged

fix sfrxETH Collateral, add new oracle #1026

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3293a1d
setup test suit, fix SFraxETHCollatera.
pmckelvy1 Dec 12, 2023
5f6b4ae
remove consoles.
pmckelvy1 Dec 12, 2023
52bb0f7
fix integration tests.
pmckelvy1 Dec 12, 2023
a57b077
fix most.
pmckelvy1 Dec 12, 2023
ee448ea
needed to move iffy test, hopefully didnt break anything else. fuck t…
pmckelvy1 Dec 13, 2023
1fab21a
cleanup linting.
pmckelvy1 Dec 13, 2023
efc21e3
fix...frxETH not sfrxETH oracle.
pmckelvy1 Dec 14, 2023
825b746
refactor oracle to use the curve ema.
pmckelvy1 Jan 16, 2024
bfeb22d
need to fix oracle manipulation in tests.
pmckelvy1 Jan 16, 2024
1f6590c
noisy new collateral test param.
pmckelvy1 Jan 16, 2024
33ba8ab
fix linting.
pmckelvy1 Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
need to fix oracle manipulation in tests.
  • Loading branch information
@pmckelvy1
pmckelvy1 committed Jan 16, 2024
commit bfeb22d6a27354507ab34c84f22f665a7076c762
2 changes: 1 addition & 1 deletion contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ contract CurvePoolEmaPriceOracleWithMinMax is ICurvePoolEmaPriceOracleWithMinMax
address public immutable CURVE_POOL_EMA_PRICE_ORACLE;

/// @notice Precision of Curve pool price_oracle()
uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_PRECISION = 1e18;
uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS = 18;

/// @notice Maximum price of token1 in token0 units of the EMA
/// @dev Must match precision of EMA
2 changes: 1 addition & 1 deletion contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
interface ICurvePoolEmaPriceOracleWithMinMax {
function CURVE_POOL_EMA_PRICE_ORACLE() external view returns (address);

function CURVE_POOL_EMA_PRICE_ORACLE_PRECISION() external view returns (uint256);
function CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS() external view returns (uint256);

function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice);

2 changes: 1 addition & 1 deletion test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts
View file
Original file line number Diff line number Diff line change
@@ -222,7 +222,7 @@ const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise<B

const collateral = ctx.collateral as unknown as SFraxEthCollateral
const clTpRData = await collateral.getCurvePoolToken1EmaPrice()
const clTpRDecimals = await collateral.CURVE_POOL_EMA_PRICE_ORACLE_PRECISION()
const clTpRDecimals = await collateral.CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS()

const refPerTok = await ctx.sfrxEth.pricePerShare()