contracts/modules/DToken.sol CHANGED Viewed

@@ -4,8 +4,14 @@
 import "../BaseLogic.sol";
+/// @notice Definition of callback method that flashLoan will invoke on your contract
+interface IFlashLoan {
+    function onFlashLoan(bytes memory data) external;
+}
 /// @notice Tokenised representation of debts
 contract DToken is BaseLogic {
     constructor(bytes32 moduleGitCommit_) BaseLogic(MODULEID__DTOKEN, moduleGitCommit_) {}
@@ -141,13 +147,29 @@
         logAssetStatus(assetCache);
     }
+    /// @notice Request a flash-loan. A onFlashLoan() callback in msg.sender will be invoked, which must repay the loan to the main Euler address prior to returning.
+    /// @param amount In underlying units
+    /// @param data Passed through to the onFlashLoan() callback, so contracts don't need to store transient data in storage
+    function flashLoan(uint amount, bytes calldata data) external nonReentrant {
+        (address underlying,,, address msgSender) = CALLER();
+        uint origBalance = IERC20(underlying).balanceOf(address(this));
+        Utils.safeTransfer(underlying, msgSender, amount);
+        IFlashLoan(msgSender).onFlashLoan(data);
+        require(IERC20(underlying).balanceOf(address(this)) >= origBalance, "e/flash-loan-not-repaid");
+    }
     /// @notice Allow spender to send an amount of dTokens to a particular sub-account
     /// @param subAccountId 0 for primary, 1-255 for a sub-account
     /// @param spender Trusted address
     /// @param amount In underlying units (use max uint256 for "infinite" allowance)
-    function approveDebt(uint subAccountId, address spender, uint amount) public reentrantOK returns (bool) {
+    function approveDebt(uint subAccountId, address spender, uint amount) public nonReentrant returns (bool) {
         (address underlying, AssetStorage storage assetStorage, address proxyAddr, address msgSender) = CALLER();
         address account = getSubAccount(msgSender, subAccountId);
         require(!isSubAccountOf(spender, account), "e/self-approval");
@@ -177,9 +199,9 @@
     /// @notice Transfer dTokens to another address (from sub-account 0)
     /// @param to Xor with the desired sub-account ID (if applicable)
     /// @param amount In underlying units. Use max uint256 for full balance.
-    function transfer(address to, uint amount) external returns (bool) {
+    function transfer(address to, uint amount) external reentrantOK returns (bool) {
         return transferFrom(address(0), to, amount);
     }
     /// @notice Transfer dTokens from one address to another

contracts/BaseLogic.sol CHANGED Viewed

@@ -289,10 +289,11 @@
         return uint144(amount);
     }
     function computeExchangeRate(AssetCache memory assetCache) private pure returns (uint) {
-        if (assetCache.totalBalances == 0) return 1e18;
-        return (assetCache.poolSize + (assetCache.totalBorrows / INTERNAL_DEBT_PRECISION)) * 1e18 / assetCache.totalBalances;
+        uint totalAssets = assetCache.poolSize + (assetCache.totalBorrows / INTERNAL_DEBT_PRECISION);
+        if (totalAssets == 0 || assetCache.totalBalances == 0) return 1e18;
+        return totalAssets * 1e18 / assetCache.totalBalances;
     }
     function underlyingAmountToBalance(AssetCache memory assetCache, uint amount) internal pure returns (uint) {
         uint exchangeRate = computeExchangeRate(assetCache);
@@ -311,9 +312,9 @@
     function callBalanceOf(AssetCache memory assetCache, address account) internal view FREEMEM returns (uint) {
         // We set a gas limit so that a malicious token can't eat up all gas and cause a liquidity check to fail.
-        (bool success, bytes memory data) = assetCache.underlying.staticcall{gas: 20000}(abi.encodeWithSelector(IERC20.balanceOf.selector, account));
+        (bool success, bytes memory data) = assetCache.underlying.staticcall{gas: 200000}(abi.encodeWithSelector(IERC20.balanceOf.selector, account));
         // If token's balanceOf() call fails for any reason, return 0. This prevents malicious tokens from causing liquidity checks to fail.
         // If the contract doesn't exist (maybe because selfdestructed), then data.length will be 0 and we will return 0.
         // Data length > 32 is allowed because some legitimate tokens append extra data that can be safely ignored.

contracts/Storage.sol CHANGED Viewed

@@ -6,9 +6,9 @@
 abstract contract Storage is Constants {
     // Dispatcher and upgrades
-    uint reentrancyLock;
+    uint internal reentrancyLock;
     address upgradeAdmin;
     address governorAdmin;
@@ -91,5 +91,6 @@
     mapping(address => AssetStorage) internal eTokenLookup; // EToken => AssetStorage
     mapping(address => address) internal dTokenLookup; // DToken => EToken
     mapping(address => address) internal pTokenLookup; // PToken => underlying
     mapping(address => address) internal reversePTokenLookup; // underlying => PToken
+    mapping(address => address) internal chainlinkPriceFeedLookup; // underlying => chainlinkAggregator
 }

contracts/Events.sol CHANGED Viewed

@@ -36,8 +36,9 @@
     event RequestWithdraw(address indexed account, uint amount);
     event RequestMint(address indexed account, uint amount);
     event RequestBurn(address indexed account, uint amount);
     event RequestTransferEToken(address indexed from, address indexed to, uint amount);
+    event RequestDonate(address indexed account, uint amount);
     event RequestBorrow(address indexed account, uint amount);
     event RequestRepay(address indexed account, uint amount);
     event RequestTransferDToken(address indexed from, address indexed to, uint amount);
@@ -54,7 +55,8 @@
     event GovSetIRM(address indexed underlying, uint interestRateModel, bytes resetParams);
     event GovSetPricingConfig(address indexed underlying, uint16 newPricingType, uint32 newPricingParameter);
     event GovSetReserveFee(address indexed underlying, uint32 newReserveFee);
     event GovConvertReserves(address indexed underlying, address indexed recipient, uint amount);
+    event GovSetChainlinkPriceFeed(address indexed underlying, address chainlinkAggregator);
     event RequestSwap(address indexed accountIn, address indexed accountOut, address indexed underlyingIn, address underlyingOut, uint amount, uint swapType);
 }

contracts/Constants.sol CHANGED Viewed

@@ -18,8 +18,9 @@
     uint internal constant MAX_POSSIBLE_ENTERED_MARKETS = 2**32; // limited by size of AccountStorage.numMarketsEntered
     uint internal constant CONFIG_FACTOR_SCALE = 4_000_000_000; // must fit into a uint32
     uint internal constant RESERVE_FEE_SCALE = 4_000_000_000; // must fit into a uint32
     uint32 internal constant DEFAULT_RESERVE_FEE = uint32(0.23 * 4_000_000_000);
+    uint internal constant INITIAL_RESERVES = 1e6;
     uint internal constant INITIAL_INTEREST_ACCUMULATOR = 1e27;
     uint internal constant AVERAGE_LIQUIDITY_PERIOD = 24 * 60 * 60;
     uint16 internal constant MIN_UNISWAP3_OBSERVATION_CARDINALITY = 144;
     uint24 internal constant DEFAULT_TWAP_WINDOW_SECONDS = 30 * 60;
@@ -41,10 +42,14 @@
     uint16 internal constant PRICINGTYPE__PEGGED = 1;
     uint16 internal constant PRICINGTYPE__UNISWAP3_TWAP = 2;
     uint16 internal constant PRICINGTYPE__FORWARDED = 3;
+    uint16 internal constant PRICINGTYPE__CHAINLINK = 4;
+    // Correct pricing types are always less than this value
+    uint16 internal constant PRICINGTYPE__OUT_OF_BOUNDS = 5;
     // Modules
     // Public single-proxy modules
     uint internal constant MODULEID__INSTALLER = 1;

Euler diff: contracts/modules/DToken.sol