Skip to content
This repository was archived by the owner on Aug 26, 2024. It is now read-only.

Commit 487e185

Browse files
TRiLeZTRiLeZ
committed
Merge branch 'development' into feat/adrastia-prudentia-caps
2 parents 922ae6e + 20da433 commit 487e185

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1972
-110
lines changed

‎.github/workflows/pull-request-build-and-test.yml

+6
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
with:
4848
submodules: recursive
4949

50+
- name: Install Npm dependencies
51+
run: npm install
52+
5053
- name: Install Foundry
5154
uses: foundry-rs/foundry-toolchain@v1
5255
with:
@@ -84,6 +87,9 @@ jobs:
8487
with:
8588
submodules: recursive
8689

90+
- name: Install Npm dependencies
91+
run: npm install
92+
8793
- name: Install Foundry
8894
uses: foundry-rs/foundry-toolchain@v1
8995
with:

‎contracts/GlobalPauser.sol

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
// SPDX-License-Identifier: UNLICENSED
2+
pragma solidity ^0.8.0;
3+
4+
import { IonicComptroller } from "./compound/ComptrollerInterface.sol";
5+
import { ICErc20 } from "./compound/CTokenInterfaces.sol";
6+
import { Ownable2Step } from "openzeppelin-contracts/contracts/access/Ownable2Step.sol";
7+
8+
interface IPoolDirectory {
9+
struct Pool {
10+
string name;
11+
address creator;
12+
address comptroller;
13+
uint256 blockPosted;
14+
uint256 timestampPosted;
15+
}
16+
17+
function getActivePools() external view returns (uint256, Pool[] memory);
18+
}
19+
20+
contract GlobalPauser is Ownable2Step {
21+
IPoolDirectory public poolDirectory;
22+
mapping(address => bool) public pauseGuardian;
23+
24+
modifier onlyPauseGuardian() {
25+
require(pauseGuardian[msg.sender], "!guardian");
26+
_;
27+
}
28+
29+
constructor(address _poolDirectory) Ownable2Step() {
30+
poolDirectory = IPoolDirectory(_poolDirectory);
31+
}
32+
33+
function setPauseGuardian(address _pauseGuardian, bool _isPauseGuardian) external onlyOwner {
34+
pauseGuardian[_pauseGuardian] = _isPauseGuardian;
35+
}
36+
37+
function pauseAll() external onlyPauseGuardian {
38+
(, IPoolDirectory.Pool[] memory pools) = poolDirectory.getActivePools();
39+
for (uint256 i = 0; i < pools.length; i++) {
40+
ICErc20[] memory markets = IonicComptroller(pools[i].comptroller).getAllMarkets();
41+
for (uint256 j = 0; j < markets.length; j++) {
42+
bool isPaused = IonicComptroller(pools[i].comptroller).borrowGuardianPaused(address(markets[j]));
43+
if (!isPaused) {
44+
IonicComptroller(pools[i].comptroller)._setBorrowPaused(markets[j], true);
45+
}
46+
47+
isPaused = IonicComptroller(pools[i].comptroller).mintGuardianPaused(address(markets[j]));
48+
if (!isPaused) {
49+
IonicComptroller(pools[i].comptroller)._setMintPaused(markets[j], true);
50+
}
51+
}
52+
}
53+
}
54+
}

‎contracts/ILiquidator.sol

+6
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,10 @@ interface ILiquidator {
4646

4747
function _whitelistRedemptionStrategies(IRedemptionStrategy[] calldata strategies, bool[] calldata whitelisted)
4848
external;
49+
50+
function setExpressRelay(address _expressRelay) external;
51+
52+
function setPoolLens(address _poolLens) external;
53+
54+
function setHealthFactorThreshold(uint256 _healthFactorThreshold) external;
4955
}

‎contracts/IonicLiquidator.sol

+69-4
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,23 @@ import "./external/uniswap/UniswapV2Library.sol";
1919

2020
import { ICErc20 } from "./compound/CTokenInterfaces.sol";
2121

22+
import "@pythnetwork/express-relay-sdk-solidity/IExpressRelay.sol";
23+
import "@pythnetwork/express-relay-sdk-solidity/IExpressRelayFeeReceiver.sol";
24+
25+
import "./PoolLens.sol";
26+
2227
/**
2328
* @title IonicLiquidator
2429
* @author David Lucid <[email protected]> (https://github.com/davidlucid)
2530
* @notice IonicLiquidator safely liquidates unhealthy borrowers (with flashloan support).
2631
* @dev Do not transfer NATIVE or tokens directly to this address. Only send NATIVE here when using a method, and only approve tokens for transfer to here when using a method. Direct NATIVE transfers will be rejected and direct token transfers will be lost.
2732
*/
28-
contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
33+
contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee, IExpressRelayFeeReceiver {
2934
using AddressUpgradeable for address payable;
3035
using SafeERC20Upgradeable for IERC20Upgradeable;
3136

37+
event VaultReceivedETH(address sender, uint256 amount, bytes permissionKey);
38+
3239
/**
3340
* @dev W_NATIVE contract address.
3441
*/
@@ -64,6 +71,27 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
6471
*/
6572
uint8 public flashSwapFee;
6673

74+
/**
75+
* @dev Addres of Pyth Express Relay for preventing value leakage in liquidations.
76+
*/
77+
IExpressRelay public expressRelay;
78+
/**
79+
* @dev Pool Lens.
80+
*/
81+
PoolLens public lens;
82+
/**
83+
* @dev Health Factor below which PER permissioning is bypassed.
84+
*/
85+
uint256 public healthFactorThreshold;
86+
87+
modifier onlyPERPermissioned(address borrower, ICErc20 cToken) {
88+
uint256 currentHealthFactor = lens.getHealthFactor(borrower, cToken.comptroller());
89+
if (currentHealthFactor > healthFactorThreshold) {
90+
require(expressRelay.isPermissioned(address(this), abi.encode(borrower)), "invalid liquidation");
91+
}
92+
_;
93+
}
94+
6795
function initialize(
6896
address _wtoken,
6997
address _uniswapV2router,
@@ -119,15 +147,21 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
119147
ICErc20 cErc20,
120148
ICErc20 cTokenCollateral,
121149
uint256 minOutputAmount
122-
) external returns (uint256) {
150+
) external onlyPERPermissioned(borrower, cTokenCollateral) returns (uint256) {
123151
// Transfer tokens in, approve to cErc20, and liquidate borrow
124152
require(repayAmount > 0, "Repay amount (transaction value) must be greater than 0.");
125153
IERC20Upgradeable underlying = IERC20Upgradeable(cErc20.underlying());
126154
underlying.safeTransferFrom(msg.sender, address(this), repayAmount);
127155
justApprove(underlying, address(cErc20), repayAmount);
128156
require(cErc20.liquidateBorrow(borrower, repayAmount, address(cTokenCollateral)) == 0, "Liquidation failed.");
129-
// Transfer seized amount to sender
130-
return transferSeizedFunds(address(cTokenCollateral), minOutputAmount);
157+
158+
// Redeem seized cTokens for underlying asset
159+
uint256 seizedCTokenAmount = cTokenCollateral.balanceOf(address(this));
160+
require(seizedCTokenAmount > 0, "No cTokens seized.");
161+
uint256 redeemResult = cTokenCollateral.redeem(seizedCTokenAmount);
162+
require(redeemResult == 0, "Error calling redeeming seized cToken: error code not equal to 0");
163+
164+
return transferSeizedFunds(address(cTokenCollateral.underlying()), minOutputAmount);
131165
}
132166

133167
/**
@@ -150,6 +184,7 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
150184
*/
151185
function safeLiquidateToTokensWithFlashLoan(LiquidateToTokensWithFlashSwapVars calldata vars)
152186
external
187+
onlyPERPermissioned(vars.borrower, vars.cTokenCollateral)
153188
returns (uint256)
154189
{
155190
// Input validation
@@ -199,6 +234,23 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
199234
require(payable(msg.sender).isContract(), "Sender is not a contract.");
200235
}
201236

237+
/**
238+
* @notice receiveAuctionProceedings function - receives native token from the express relay
239+
* You can use permission key to distribute the received funds to users who got liquidated, LPs, etc...
240+
*/
241+
function receiveAuctionProceedings(bytes calldata permissionKey) external payable {
242+
emit VaultReceivedETH(msg.sender, msg.value, permissionKey);
243+
}
244+
245+
function withdrawAll() external onlyOwner {
246+
uint256 balance = address(this).balance;
247+
require(balance > 0, "No Ether left to withdraw");
248+
249+
// Transfer all Ether to the owner
250+
(bool sent, ) = msg.sender.call{ value: balance }("");
251+
require(sent, "Failed to send Ether");
252+
}
253+
202254
/**
203255
* @dev Callback function for Uniswap flashloans.
204256
*/
@@ -419,6 +471,19 @@ contract IonicLiquidator is OwnableUpgradeable, ILiquidator, IUniswapV2Callee {
419471
}
420472
}
421473

474+
function setExpressRelay(address _expressRelay) external onlyOwner {
475+
expressRelay = IExpressRelay(_expressRelay);
476+
}
477+
478+
function setPoolLens(address _poolLens) external onlyOwner {
479+
lens = PoolLens(_poolLens);
480+
}
481+
482+
function setHealthFactorThreshold(uint256 _healthFactorThreshold) external onlyOwner {
483+
require(_healthFactorThreshold <= 1e18, "Invalid Health Factor Threshold");
484+
healthFactorThreshold = _healthFactorThreshold;
485+
}
486+
422487
/**
423488
* @dev Redeem "special" collateral tokens (before swapping the output for borrowed tokens to be repaid via Uniswap).
424489
* Public visibility because we have to call this function externally if called from a payable IonicLiquidator function (for some reason delegatecall fails when called with msg.value > 0).

‎contracts/IonicUniV3Liquidator.sol

+75-4
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@ import { IUniswapV3Quoter } from "./external/uniswap/quoter/interfaces/IUniswapV
1616

1717
import { ICErc20 } from "./compound/CTokenInterfaces.sol";
1818

19+
import "./PoolLens.sol";
20+
import "@pythnetwork/express-relay-sdk-solidity/IExpressRelay.sol";
21+
import "@pythnetwork/express-relay-sdk-solidity/IExpressRelayFeeReceiver.sol";
22+
1923
/**
2024
* @title IonicUniV3Liquidator
2125
* @author Veliko Minkov <[email protected]> (https://github.com/vminkov)
2226
* @notice IonicUniV3Liquidator liquidates unhealthy borrowers with flashloan support.
2327
*/
24-
contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3FlashCallback {
28+
contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3FlashCallback, IExpressRelayFeeReceiver {
2529
using AddressUpgradeable for address payable;
2630
using SafeERC20Upgradeable for IERC20Upgradeable;
2731

32+
event VaultReceivedETH(address sender, uint256 amount, bytes permissionKey);
2833
/**
2934
* @dev Cached liquidator profit exchange source.
3035
* ERC20 token address or the zero address for NATIVE.
@@ -48,6 +53,27 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
4853
mapping(address => bool) public redemptionStrategiesWhitelist;
4954
IUniswapV3Quoter public quoter;
5055

56+
/**
57+
* @dev Addres of Pyth Express Relay for preventing value leakage in liquidations.
58+
*/
59+
IExpressRelay public expressRelay;
60+
/**
61+
* @dev Pool Lens.
62+
*/
63+
PoolLens public lens;
64+
/**
65+
* @dev Health Factor below which PER permissioning is bypassed.
66+
*/
67+
uint256 public healthFactorThreshold;
68+
69+
modifier onlyPERPermissioned(address borrower, ICErc20 cToken) {
70+
uint256 currentHealthFactor = lens.getHealthFactor(borrower, cToken.comptroller());
71+
if (currentHealthFactor > healthFactorThreshold) {
72+
require(expressRelay.isPermissioned(address(this), abi.encode(borrower)), "invalid liquidation");
73+
}
74+
_;
75+
}
76+
5177
function initialize(address _wtoken, address _quoter) external initializer {
5278
__Ownable_init();
5379
W_NATIVE_ADDRESS = _wtoken;
@@ -68,15 +94,21 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
6894
ICErc20 cErc20,
6995
ICErc20 cTokenCollateral,
7096
uint256 minOutputAmount
71-
) external returns (uint256) {
97+
) external onlyPERPermissioned(borrower, cTokenCollateral) returns (uint256) {
7298
// Transfer tokens in, approve to cErc20, and liquidate borrow
7399
require(repayAmount > 0, "Repay amount (transaction value) must be greater than 0.");
74100
IERC20Upgradeable underlying = IERC20Upgradeable(cErc20.underlying());
75101
underlying.safeTransferFrom(msg.sender, address(this), repayAmount);
76102
underlying.approve(address(cErc20), repayAmount);
77103
require(cErc20.liquidateBorrow(borrower, repayAmount, address(cTokenCollateral)) == 0, "Liquidation failed.");
78-
// Transfer seized amount to sender
79-
return transferSeizedFunds(address(cTokenCollateral), minOutputAmount);
104+
105+
// Redeem seized cTokens for underlying asset
106+
uint256 seizedCTokenAmount = cTokenCollateral.balanceOf(address(this));
107+
require(seizedCTokenAmount > 0, "No cTokens seized.");
108+
uint256 redeemResult = cTokenCollateral.redeem(seizedCTokenAmount);
109+
require(redeemResult == 0, "Error calling redeeming seized cToken: error code not equal to 0");
110+
111+
return transferSeizedFunds(address(cTokenCollateral.underlying()), minOutputAmount);
80112
}
81113

82114
/**
@@ -95,6 +127,7 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
95127

96128
function safeLiquidateToTokensWithFlashLoan(LiquidateToTokensWithFlashSwapVars calldata vars)
97129
external
130+
onlyPERPermissioned(vars.borrower, vars.cTokenCollateral)
98131
returns (uint256)
99132
{
100133
// Input validation
@@ -144,6 +177,23 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
144177
require(payable(msg.sender).isContract(), "Sender is not a contract.");
145178
}
146179

180+
/**
181+
* @notice receiveAuctionProceedings function - receives native token from the express relay
182+
* You can use permission key to distribute the received funds to users who got liquidated, LPs, etc...
183+
*/
184+
function receiveAuctionProceedings(bytes calldata permissionKey) external payable {
185+
emit VaultReceivedETH(msg.sender, msg.value, permissionKey);
186+
}
187+
188+
function withdrawAll() external onlyOwner {
189+
uint256 balance = address(this).balance;
190+
require(balance > 0, "No Ether left to withdraw");
191+
192+
// Transfer all Ether to the owner
193+
(bool sent, ) = msg.sender.call{ value: balance }("");
194+
require(sent, "Failed to send Ether");
195+
}
196+
147197
/**
148198
* @dev Callback function for Uniswap flashloans.
149199
*/
@@ -156,6 +206,14 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
156206
uniswapV3FlashCallback(fee0, fee1, data);
157207
}
158208

209+
function algebraFlashCallback(
210+
uint256 fee0,
211+
uint256 fee1,
212+
bytes calldata data
213+
) external {
214+
uniswapV3FlashCallback(fee0, fee1, data);
215+
}
216+
159217
function uniswapV3FlashCallback(
160218
uint256 fee0,
161219
uint256 fee1,
@@ -333,6 +391,19 @@ contract IonicUniV3Liquidator is OwnableUpgradeable, ILiquidator, IUniswapV3Flas
333391
}
334392
}
335393

394+
function setExpressRelay(address _expressRelay) external onlyOwner {
395+
expressRelay = IExpressRelay(_expressRelay);
396+
}
397+
398+
function setPoolLens(address _poolLens) external onlyOwner {
399+
lens = PoolLens(_poolLens);
400+
}
401+
402+
function setHealthFactorThreshold(uint256 _healthFactorThreshold) external onlyOwner {
403+
require(_healthFactorThreshold <= 1e18, "Invalid Health Factor Threshold");
404+
healthFactorThreshold = _healthFactorThreshold;
405+
}
406+
336407
/**
337408
* @dev Redeem "special" collateral tokens (before swapping the output for borrowed tokens to be repaid via Uniswap).
338409
* Public visibility because we have to call this function externally if called from a payable IonicLiquidator function (for some reason delegatecall fails when called with msg.value > 0).

‎contracts/PoolLens.sol

+18-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,24 @@ contract PoolLens is Initializable {
584584
}
585585

586586
function getHealthFactor(address user, IonicComptroller pool) external view returns (uint256) {
587-
(uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getAccountLiquidity(user);
587+
return getHealthFactorHypothetical(pool, user, address(0), 0, 0, 0);
588+
}
589+
590+
function getHealthFactorHypothetical(
591+
IonicComptroller pool,
592+
address account,
593+
address cTokenModify,
594+
uint256 redeemTokens,
595+
uint256 borrowAmount,
596+
uint256 repayAmount
597+
) public view returns (uint256) {
598+
(uint256 err, uint256 collateralValue, uint256 liquidity, uint256 shortfall) = pool.getHypotheticalAccountLiquidity(
599+
account,
600+
cTokenModify,
601+
redeemTokens,
602+
borrowAmount,
603+
repayAmount
604+
);
588605

589606
if (err != 0) revert ComptrollerError(err);
590607

0 commit comments

Comments
 (0)