minor edits + lint

This commit is contained in:
Shriya Tyagi 2022-08-26 15:36:30 +05:30
parent bd03d6e709
commit ecb57503ee
4 changed files with 68 additions and 61 deletions

View File

@ -3,11 +3,10 @@ pragma solidity ^0.7.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
contract Events { contract Events {
event LogEulerImport( event LogEulerImport(
address user, address user,
uint sourceId, uint256 sourceId,
uint targetId, uint256 targetId,
address[] supplyTokens, address[] supplyTokens,
uint256[] supplyAmounts, uint256[] supplyAmounts,
address[] borrowTokens, address[] borrowTokens,

View File

@ -6,7 +6,6 @@ import { Basic } from "../../../common/basic.sol";
import "./interface.sol"; import "./interface.sol";
contract EulerHelpers is Basic { contract EulerHelpers is Basic {
/** /**
* @dev Euler's Market Module * @dev Euler's Market Module
*/ */
@ -16,7 +15,8 @@ contract EulerHelpers is Basic {
/** /**
* @dev Euler's Execution Module * @dev Euler's Execution Module
*/ */
IEulerExecute internal constant eulerExec = IEulerExecute(0x59828FdF7ee634AaaD3f58B19fDBa3b03E2D9d80); IEulerExecute internal constant eulerExec =
IEulerExecute(0x59828FdF7ee634AaaD3f58B19fDBa3b03E2D9d80);
/** /**
* @dev Compute sub account address. * @dev Compute sub account address.
@ -63,7 +63,9 @@ contract EulerHelpers is Basic {
) internal view returns (ImportData memory) { ) internal view returns (ImportData memory) {
data.supplyAmts = new uint256[](inputData._supplyTokens.length); data.supplyAmts = new uint256[](inputData._supplyTokens.length);
data.supplyTokens = new address[](inputData._supplyTokens.length); data.supplyTokens = new address[](inputData._supplyTokens.length);
data.eTokens = new EulerTokenInterface[](inputData._supplyTokens.length); data.eTokens = new EulerTokenInterface[](
inputData._supplyTokens.length
);
uint256 length_ = inputData._supplyTokens.length; uint256 length_ = inputData._supplyTokens.length;
for (uint256 i = 0; i < length_; i++) { for (uint256 i = 0; i < length_; i++) {
for (uint256 j = i + 1; j < length_; j++) { for (uint256 j = i + 1; j < length_; j++) {
@ -78,7 +80,9 @@ contract EulerHelpers is Basic {
? wethAddr ? wethAddr
: inputData._supplyTokens[i]; : inputData._supplyTokens[i];
data.supplyTokens[i] = _token; data.supplyTokens[i] = _token;
data.eTokens[i] = EulerTokenInterface(markets.underlyingToEToken(_token)); data.eTokens[i] = EulerTokenInterface(
markets.underlyingToEToken(_token)
);
data.supplyAmts[i] = data.eTokens[i].balanceOf(userAccount); //All 18 dec data.supplyAmts[i] = data.eTokens[i].balanceOf(userAccount); //All 18 dec
} }
@ -90,7 +94,7 @@ contract EulerHelpers is Basic {
ImportInputData memory inputData, ImportInputData memory inputData,
ImportData memory data ImportData memory data
) internal view returns (ImportData memory) { ) internal view returns (ImportData memory) {
uint _borrowTokensLength = inputData._borrowTokens.length; uint256 _borrowTokensLength = inputData._borrowTokens.length;
if (_borrowTokensLength > 0) { if (_borrowTokensLength > 0) {
data.borrowTokens = new address[](_borrowTokensLength); data.borrowTokens = new address[](_borrowTokensLength);
@ -112,7 +116,9 @@ contract EulerHelpers is Basic {
: inputData._borrowTokens[i]; : inputData._borrowTokens[i];
data.borrowTokens[i] = _token; data.borrowTokens[i] = _token;
data.dTokens[i] = EulerTokenInterface(markets.underlyingToDToken(_token)); data.dTokens[i] = EulerTokenInterface(
markets.underlyingToDToken(_token)
);
data.borrowAmts[i] = data.dTokens[i].balanceOf(userAccount); data.borrowAmts[i] = data.dTokens[i].balanceOf(userAccount);
} }
} }

View File

@ -3,7 +3,6 @@ pragma solidity ^0.7.0;
pragma experimental ABIEncoderV2; pragma experimental ABIEncoderV2;
interface EulerTokenInterface { interface EulerTokenInterface {
function balanceOf(address _user) external view returns (uint256); function balanceOf(address _user) external view returns (uint256);
function transferFrom( function transferFrom(
@ -37,7 +36,6 @@ interface IEulerMarkets {
} }
interface IEulerExecute { interface IEulerExecute {
struct EulerBatchItem { struct EulerBatchItem {
bool allowError; bool allowError;
address proxyAddr; address proxyAddr;
@ -49,7 +47,10 @@ interface IEulerExecute {
bytes result; bytes result;
} }
function batchDispatch(EulerBatchItem[] calldata items, address[] calldata deferLiquidityChecks) external; function batchDispatch(
EulerBatchItem[] calldata items,
address[] calldata deferLiquidityChecks
) external;
function deferLiquidityCheck(address account, bytes memory data) external; function deferLiquidityCheck(address account, bytes memory data) external;
} }

View File

@ -24,6 +24,8 @@ contract EulerImport is EulerHelpers {
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
require(sourceId < 256 && targetId < 256, "Id should be less than 256");
(_eventName, _eventParam) = _importEuler( (_eventName, _eventParam) = _importEuler(
userAccount, userAccount,
sourceId, sourceId,
@ -45,11 +47,7 @@ contract EulerImport is EulerHelpers {
uint256 sourceId, uint256 sourceId,
uint256 targetId, uint256 targetId,
ImportInputData memory inputData ImportInputData memory inputData
) ) internal returns (string memory _eventName, bytes memory _eventParam) {
internal
returns (string memory _eventName, bytes memory _eventParam)
{
require(inputData._supplyTokens.length > 0, "0-length-not-allowed"); require(inputData._supplyTokens.length > 0, "0-length-not-allowed");
require( require(
AccountInterface(address(this)).isAuth(userAccount), AccountInterface(address(this)).isAuth(userAccount),
@ -78,11 +76,14 @@ contract EulerImport is EulerHelpers {
for (uint16 i = 0; i < inputData._enterMarket.length; i++) { for (uint16 i = 0; i < inputData._enterMarket.length; i++) {
if (inputData._enterMarket[i]) { if (inputData._enterMarket[i]) {
++enterMarkets; ++enterMarketsLength;
} }
} }
helper.totalExecutions = helper.supplylength + enterMarkets + helper.borrowlength; helper.totalExecutions =
helper.supplylength +
enterMarketsLength +
helper.borrowlength;
IEulerExecute.EulerBatchItem[] IEulerExecute.EulerBatchItem[]
memory items = new IEulerExecute.EulerBatchItem[]( memory items = new IEulerExecute.EulerBatchItem[](