Skip to content

fix: normalize scale of fetchadata outputs so they're all based in 1e18 #2

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

Merged
MazyGio merged 2 commits into from
Jul 4, 2025
Merged

fix: normalize scale of fetchadata outputs so they're all based in 1e18 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfe1709
fix: normalize scale of fetchadata outputs so they're all based in 1e18
MazyGio Jul 3, 2025
58cb879
fix: run forge fmt
MazyGio Jul 4, 2025
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
21 changes: 17 additions & 4 deletions src/JITpilot.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {IEVault, IERC20} from "evk/EVault/IEVault.sol";
import {IEulerSwapFactory} from "euler-swap/interfaces/IEulerSwapFactory.sol";
import {IMaglevLens} from "src/interfaces/IMaglevLens.sol";
import {IPriceOracle} from "evk/interfaces/IPriceOracle.sol";
import {console2 as console} from "forge-std/console2.sol";

/**
* @title JITpilot
Expand Down Expand Up @@ -310,29 +311,36 @@ contract JITpilot {
collateralVaults[0] = eulerSwapData.params.vault0;
collateralVaults[1] = eulerSwapData.params.vault1;
IMaglevLens.VaultGlobal[] memory collateralVaultsGlobal = maglevLens.vaultsGlobal(collateralVaults);
// packed2: shares (160), supply APY (48), borrow APY (48)
for (uint256 i; i < collateralVaultsGlobal.length; ++i) {
uint256 supplyApy = uint256((collateralVaultsGlobal[i].packed2 << (256 - 96)) >> (256 - 48));
supplyApyTotal += supplyApy * getCollateralValue(lp, collateralVaults[i]) / collateralValueTotal;
console.log("Supply APY for vault", collateralVaults[i], "is", supplyApy);
console.log("Supply APY total is", supplyApyTotal);
}

// get the currently enabled controller vault (i.e. the debt vault)
address controllerVault = getCurrentControllerVault(lp);

// If there is no controller, there is no debt, and no liquidation metrics to calculate
if (controllerVault == address(0)) {
console.log("doesn't have controller vault: ", controllerVault);
blockData.allowedLTV = 0;
blockData.currentLTV = 0;
// If there is no debt, there is no looping or leverage
blockData.depositValue = collateralValueTotal;
blockData.netInterest = int256(supplyApyTotal);
} else {
console.log("has controller vault: ", controllerVault);
// Figure out which vault is the collateralVault
address collateralVault = (controllerVault == eulerSwapData.params.vault0)
? eulerSwapData.params.vault1
: eulerSwapData.params.vault0;
uint256 debtValue = getDebtValue(lp, controllerVault);
blockData.allowedLTV = IEVault(controllerVault).LTVLiquidation(collateralVault);
blockData.currentLTV = debtValue / collateralValueTotal;
console.log("debtValue: ", debtValue);
blockData.allowedLTV = uint256(IEVault(controllerVault).LTVLiquidation(collateralVault)) * 1e18 / 1e4;
blockData.currentLTV = debtValue * 1e18 / collateralValueTotal;
console.log("currentLTV: ", blockData.currentLTV);

address[] memory controllerVaultArray = new address[](1);
controllerVaultArray[0] = controllerVault;
Expand All @@ -345,11 +353,12 @@ contract JITpilot {
blockData.depositValue = collateralValueTotal - debtValue;
if (supplyApyTotal * collateralValueTotal < borrowApyTotal * debtValue) {
// avoid overflow
blockData.netInterest = -int256((borrowApyTotal * debtValue - supplyApyTotal * collateralValueTotal) / blockData.depositValue);
blockData.netInterest = -int256((borrowApyTotal * debtValue - supplyApyTotal * collateralValueTotal) / blockData.depositValue)
* 1e9;
} else {
blockData.netInterest = int256(
(supplyApyTotal * collateralValueTotal - borrowApyTotal * debtValue) / blockData.depositValue
);
) * 1e9;
}
}

Expand Down Expand Up @@ -565,4 +574,8 @@ contract JITpilot {

return currentDebtValue;
}

function getData(address lp) external view returns (BlockData memory) {
return fetchData(lp);
}
}