Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor edits

Browse Source
This commit is contained in:
Shriya Tyagi 2022-07-09 18:38:16 +04:00
parent 43a088ecb4
commit c13e78294c
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/mainnet/connectors/euler/interface.sol
View File

@ -64,8 +64,7 @@ interface IEulerDToken {
) external returns (bool); ) external returns (bool);
} }
interface IEulerSwap { struct Swap1InchParams {
struct Swap1InchParams {
uint256 subAccountIdIn; uint256 subAccountIdIn;
uint256 subAccountIdOut; uint256 subAccountIdOut;
address underlyingIn; address underlyingIn;
@ -73,7 +72,8 @@ interface IEulerSwap {
uint256 amount; uint256 amount;
uint256 amountOutMinimum; uint256 amountOutMinimum;
bytes payload; bytes payload;
} }
interface IEulerSwap {
function swap1Inch(Swap1InchParams memory) external; function swap1Inch(Swap1InchParams memory) external;
} }

10
contracts/mainnet/connectors/euler/main.sol
View File

@ -171,16 +171,15 @@ abstract contract Euler is Helpers {
{ {
uint256 _amt = getUint(getId, amt); uint256 _amt = getUint(getId, amt);
bool isEth = token == ethAddr ? true : false; bool isEth = token == ethAddr;
address _token = isEth ? wethAddr : token; address _token = isEth ? wethAddr : token;
IEulerDToken borrowedDToken = IEulerDToken( IEulerDToken borrowedDToken = IEulerDToken(
markets.underlyingToDToken(_token) markets.underlyingToDToken(_token)
); );
_amt = _amt == uint256(-1) ? borrowedDToken.balanceOf(address(this)) : _amt;
if (isEth) { if (isEth) {
_amt = _amt == uint256(-1) ? borrowedDToken.balanceOf(address(this)) : _amt;
if (isEth) {
convertEthToWeth(isEth, TokenInterface(_token), _amt); convertEthToWeth(isEth, TokenInterface(_token), _amt);
} }
@ -448,8 +447,7 @@ if (isEth) {
wmul(params.unitAmt, helperParams._sellAmt18) wmul(params.unitAmt, helperParams._sellAmt18)
); );
IEulerSwap.Swap1InchParams memory oneInchParams = IEulerSwap Swap1InchParams memory oneInchParams = Swap1InchParams({
.Swap1InchParams({
subAccountIdIn: params.subAccountFrom, subAccountIdIn: params.subAccountFrom,
subAccountIdOut: params.subAccountTo, subAccountIdOut: params.subAccountTo,
underlyingIn: helperParams._sellAddr, underlyingIn: helperParams._sellAddr,

12
contracts/mainnet/connectors/euler/variables.sol
View File

@ -1,12 +0,0 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.7.0;
import "./interface.sol";
contract Variables {
address internal constant EULER_MAINNET =
0x27182842E098f60e3D576794A5bFFb0777E025d3;
IEulerMarkets internal constant markets =
IEulerMarkets(0x3520d5a913427E6F0D6A83E07ccD4A4da316e4d3);
IEulerSwap internal constant swapExec =
IEulerSwap(0x7123C8cBBD76c5C7fCC9f7150f23179bec0bA341);
}

7
scripts/tests/mainnet/tokens.ts
View File

@ -27,6 +27,13 @@ export const tokens = {
name: "USD Coin", name: "USD Coin",
address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", address: "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
decimals: 6 decimals: 6
},
weth: {
type: "token",
symbol: "WETH",
name: "Wrapped Ether",
address: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
decimals: 18
} }
}; };