Skip to content

Commit 939dae1

Browse files
committed
forge fmt
1 parent 701712e commit 939dae1

File tree

2 files changed

+61
-28
lines changed

2 files changed

+61
-28
lines changed

script/DeployScenario.s.sol

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ import {PoolManagerDeployer} from "euler-swap/../test/utils/PoolManagerDeployer.
4949

5050
import {MaglevLens} from "src/MaglevLens.sol";
5151

52-
5352
struct Asset {
5453
string symbol;
5554
address asset;
@@ -190,7 +189,10 @@ contract DeployScenario is Script {
190189
vm.writeJson(result, "./dev-ctx/addresses/31337/CoreAddresses.json");
191190
}
192191

193-
function genAsset(string memory symbol, uint8 decimals, string memory price, uint256 priceNum) internal returns (TestERC20, IEVault) {
192+
function genAsset(string memory symbol, uint8 decimals, string memory price, uint256 priceNum)
193+
internal
194+
returns (TestERC20, IEVault)
195+
{
194196
Asset memory a;
195197

196198
a.symbol = symbol;
@@ -248,7 +250,16 @@ contract DeployScenario is Script {
248250
vm.writeLine(pricesFile, "{");
249251

250252
for (uint256 i; i < assets.length; ++i) {
251-
string memory line = string(abi.encodePacked("\"", vm.toString(assets[i].asset), "\": {\"price\":", assets[i].price, "}", (i == assets.length - 1 ? "" : ",") ));
253+
string memory line = string(
254+
abi.encodePacked(
255+
"\"",
256+
vm.toString(assets[i].asset),
257+
"\": {\"price\":",
258+
assets[i].price,
259+
"}",
260+
(i == assets.length - 1 ? "" : ",")
261+
)
262+
);
252263
vm.writeLine(pricesFile, line);
253264
}
254265

src/MaglevLens.sol

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ contract MaglevLens {
1212

1313
function vaultsStatic(address[] calldata vaults) external view returns (bytes[] memory output) {
1414
output = new bytes[](vaults.length);
15-
for (uint i; i < vaults.length; ++i) {
15+
for (uint256 i; i < vaults.length; ++i) {
1616
IEVault v = IEVault(vaults[i]);
1717
output[i] = abi.encodePacked(v.asset(), v.decimals(), v.symbol());
1818
}
@@ -26,7 +26,7 @@ contract MaglevLens {
2626
function vaultsGlobal(address[] calldata vaults) external view returns (VaultGlobal[] memory output) {
2727
output = new VaultGlobal[](vaults.length);
2828

29-
for (uint i; i < vaults.length; ++i) {
29+
for (uint256 i; i < vaults.length; ++i) {
3030
IEVault v = IEVault(vaults[i]);
3131

3232
uint256 cash = v.cash();
@@ -55,10 +55,8 @@ contract MaglevLens {
5555
uint32 configFlags;
5656
address unitOfAccount;
5757
address oracle;
58-
5958
// IBorrowing
6059
address dToken;
61-
6260
// IVault
6361
uint256 accumulatedFees;
6462
address creator;
@@ -67,7 +65,7 @@ contract MaglevLens {
6765
function vaultsDetailed(address[] calldata vaults) external view returns (VaultDetailed[] memory output) {
6866
output = new VaultDetailed[](vaults.length);
6967

70-
for (uint i; i < vaults.length; ++i) {
68+
for (uint256 i; i < vaults.length; ++i) {
7169
IEVault v = IEVault(vaults[i]);
7270
VaultDetailed memory o = output[i];
7371

@@ -95,9 +93,15 @@ contract MaglevLens {
9593
uint256 packed;
9694
}
9795

98-
function vaultsPersonalState(address evc, address me, uint256 subAccountBitmask, address[] calldata vaults) external view returns (VaultPersonalState[] memory output) {
96+
function vaultsPersonalState(address evc, address me, uint256 subAccountBitmask, address[] calldata vaults)
97+
external
98+
view
99+
returns (VaultPersonalState[] memory output)
100+
{
99101
uint256 numAccounts;
100-
for (uint256 b = subAccountBitmask; b != 0; b >>= 1) if (b & 1 != 0) numAccounts++;
102+
for (uint256 b = subAccountBitmask; b != 0; b >>= 1) {
103+
if (b & 1 != 0) numAccounts++;
104+
}
101105

102106
output = new VaultPersonalState[](numAccounts * vaults.length);
103107

@@ -111,26 +115,31 @@ contract MaglevLens {
111115
IEVault v = IEVault(vaults[j]);
112116

113117
uint256 index = (currAccount * vaults.length) + j;
114-
uint256 flags = (IEVC(evc).isCollateralEnabled(a, address(v)) ? 1 : 0) | (IEVC(evc).isControllerEnabled(a, address(v)) ? 2 : 0);
118+
uint256 flags = (IEVC(evc).isCollateralEnabled(a, address(v)) ? 1 : 0)
119+
| (IEVC(evc).isControllerEnabled(a, address(v)) ? 2 : 0);
115120
output[index].packed = (flags << 224) | (v.balanceOf(a) << 112) | v.debtOf(a);
116121
}
117122

118123
if (++currAccount >= numAccounts) break;
119124
}
120125
}
121126

122-
function myEnteredMarkets(address evc, address me) external view returns (address[] memory collaterals, address[] memory controllers) {
127+
function myEnteredMarkets(address evc, address me)
128+
external
129+
view
130+
returns (address[] memory collaterals, address[] memory controllers)
131+
{
123132
collaterals = IEVC(evc).getCollaterals(me);
124133
controllers = IEVC(evc).getControllers(me);
125134
}
126135

127-
128-
129-
130-
131136
uint256 internal constant SECONDS_PER_YEAR = 365.2425 * 86400;
132137

133-
function _computeAPYs(uint256 borrowSPY, uint256 cash, uint256 borrows, uint256 interestFee) internal pure returns (uint256 borrowAPY, uint256 supplyAPY) {
138+
function _computeAPYs(uint256 borrowSPY, uint256 cash, uint256 borrows, uint256 interestFee)
139+
internal
140+
pure
141+
returns (uint256 borrowAPY, uint256 supplyAPY)
142+
{
134143
uint256 totalAssets = cash + borrows;
135144
bool overflow;
136145

@@ -145,7 +154,11 @@ contract MaglevLens {
145154
supplyAPY /= 1e18;
146155
}
147156

148-
function getLTVMatrix(address[] calldata vaults, bool liquidationLtv) external view returns (uint16[] memory ltvs) {
157+
function getLTVMatrix(address[] calldata vaults, bool liquidationLtv)
158+
external
159+
view
160+
returns (uint16[] memory ltvs)
161+
{
149162
uint256 num = vaults.length;
150163
ltvs = new uint16[](num * num);
151164

@@ -155,14 +168,12 @@ contract MaglevLens {
155168
for (uint256 j = 0; j < num; ++j) {
156169
if (i == j) continue;
157170
IEVault debtVault = IEVault(vaults[j]);
158-
ltvs[(i*num) + j] = liquidationLtv ? debtVault.LTVLiquidation(collateralVault) : debtVault.LTVBorrow(collateralVault);
171+
ltvs[(i * num) + j] =
172+
liquidationLtv ? debtVault.LTVLiquidation(collateralVault) : debtVault.LTVBorrow(collateralVault);
159173
}
160174
}
161175
}
162176

163-
164-
165-
166177
struct EulerSwapData {
167178
address addr;
168179
IEulerSwap.Params params;
@@ -181,7 +192,7 @@ contract MaglevLens {
181192
output.addr = poolAddr;
182193
output.params = pool.getParams();
183194
{
184-
(uint112 reserve0, uint112 reserve1, ) = pool.getReserves();
195+
(uint112 reserve0, uint112 reserve1,) = pool.getReserves();
185196
output.reserve0 = reserve0;
186197
output.reserve1 = reserve1;
187198
}
@@ -207,21 +218,32 @@ contract MaglevLens {
207218
}
208219
}
209220

210-
function eulerSwapQuoteMulti(address[] memory eulerSwaps, address tokenIn, address tokenOut, uint256 amount, bool exactIn) external view returns (uint256[] memory quotes) {
221+
function eulerSwapQuoteMulti(
222+
address[] memory eulerSwaps,
223+
address tokenIn,
224+
address tokenOut,
225+
uint256 amount,
226+
bool exactIn
227+
) external view returns (uint256[] memory quotes) {
211228
quotes = new uint256[](eulerSwaps.length);
212229

213230
for (uint256 i = 0; i < eulerSwaps.length; ++i) {
214231
try IEulerSwap(eulerSwaps[i]).computeQuote(tokenIn, tokenOut, amount, exactIn) returns (uint256 q) {
215232
quotes[i] = q;
216-
} catch {
217-
}
233+
} catch {}
218234
}
219235
}
220236

221237
error AssertEulerSwapReservesFailure();
222238

223-
function assertEulerSwapReserves(address eulerSwap, uint112 reserve0Min, uint112 reserve0Max, uint112 reserve1Min, uint112 reserve1Max) external view {
224-
(uint112 reserve0, uint112 reserve1, ) = IEulerSwap(eulerSwap).getReserves();
239+
function assertEulerSwapReserves(
240+
address eulerSwap,
241+
uint112 reserve0Min,
242+
uint112 reserve0Max,
243+
uint112 reserve1Min,
244+
uint112 reserve1Max
245+
) external view {
246+
(uint112 reserve0, uint112 reserve1,) = IEulerSwap(eulerSwap).getReserves();
225247
require(reserve0 >= reserve0Min && reserve0 <= reserve0Max, AssertEulerSwapReservesFailure());
226248
require(reserve1 >= reserve1Min && reserve1 <= reserve1Max, AssertEulerSwapReservesFailure());
227249
}

0 commit comments

Comments
 (0)