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

feat: createLoan function update

Browse Source
This commit is contained in:
Shriya Tyagi 2023-09-09 19:16:54 +04:00
parent 12d86342ba
commit c20a79b5d0
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/mainnet/connectors/crv_USD/helpers.sol
View File

@ -12,12 +12,13 @@ abstract contract Helpers is DSMath, Basic {
/** /**
* @dev ControllerFactory Interface * @dev ControllerFactory Interface
*/ */
IControllerFactory internal constant ctrFactory = IControllerFactory(0xC9332fdCB1C491Dcc683bAe86Fe3cb70360738BC); IControllerFactory internal constant CONTROLLER_FACTORY =
IControllerFactory(0xC9332fdCB1C491Dcc683bAe86Fe3cb70360738BC);
/** /**
* @dev Get controller address by given collateral asset * @dev Get controller address by given collateral asset
*/ */
function getController(address collateral, uint256 i) internal view returns(IController controller) { function getController(address collateral, uint256 i) internal view returns(IController controller) {
controller = IController(ctrFactory.get_controller(collateral, i)); controller = IController(CONTROLLER_FACTORY.get_controller(collateral, i));
} }
} }

61
contracts/mainnet/connectors/crv_USD/main.sol
View File

@ -2,7 +2,7 @@
pragma solidity ^0.7.0; pragma solidity ^0.7.0;
/** /**
* @title MakerDAO. * @title Curve USD.
* @dev Collateralized Borrowing. * @dev Collateralized Borrowing.
*/ */
@ -11,41 +11,52 @@ import { Helpers } from "./helpers.sol";
import { Events } from "./events.sol"; import { Events } from "./events.sol";
import "./interface.sol"; import "./interface.sol";
abstract contract MakerResolver is Helpers, Events { abstract contract CurveUSDResolver is Helpers, Events {
/** /**
* @dev Create loan * @dev Create loan
* @param collateral collateral token address * @dev If a user already has an existing loan, the function will revert.
* @param version controller version * @param collateral Collateral token address.(For ETH: `0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE`)
* @param amt Amount of collateral to use * @param amount Amount of collateral (For max: `uint256(-1)`)
* @param debt Stablecoin debt to take * @param debt Stablecoin debt to take (For max: `uint256(-1)`)
* @param N Number of bands to deposit into (to do autoliquidation-deliquidation), can be from MIN_TICKS(4) to MAX_TICKS(50) * @param numBands Number of bands to deposit into (to do autoliquidation-deliquidation), can only be from MIN_TICKS(4) to MAX_TICKS(50)
* @param controllerVersion Controller version,
* @param getId ID to retrieve amt.
* @param setId ID stores the amount of debt borrowed.
*/ */
function createLoan( function createLoan(
address collateral, address collateral,
uint256 version, uint256 amount,
uint256 amt,
uint256 debt, uint256 debt,
uint256 N uint256 numBands,
uint256 controllerVersion,
uint256 getId,
uint256 setId
) external returns (string memory _eventName, bytes memory _eventParam) { ) external returns (string memory _eventName, bytes memory _eventParam) {
address _collateral = collateral == ethAddr ? wethAddr : collateral; uint256 _amt = getUint(getId, amount);
IController controller = getController(_collateral, version);
uint256 _amt = amt;
uint256 ethAmt; bool _isEth = collateral == ethAddr;
if (collateral == ethAddr) { address _collateralAddress = _isEth ? wethAddr : collateral;
_amt = _amt == uint(-1) ? address(this).balance : _amt; TokenInterface collateralContract = TokenInterface(_collateralAddress);
ethAmt = _amt;
// Get controller address of collateral.
IController controller = getController(_collateralAddress, controllerVersion);
if (_isEth) {
_amt = _amt == uint256(-1) ? address(this).balance : _amt;
convertEthToWeth(_isEth, collateralContract, _amt);
} else { } else {
TokenInterface collateralContract = TokenInterface(_collateral); _amt = _amt == uint256(-1) ? collateralContract.balanceOf(address(this)) : _amt;
_amt = _amt == uint(-1) ? collateralContract.balanceOf(address(this)) : _amt;
approve(collateralContract, address(controller), _amt);
} }
uint256 _debt = debt == uint(-1) ? controller.max_borrowable(_amt, N) : debt; approve(collateralContract, address(controller), _amt);
controller.create_loan{value: ethAmt}(_amt, _debt, N); uint256 _debt = debt == uint256(-1) ? controller.max_borrowable(_amt, numBands) : debt;
controller.create_loan(_amt, _debt, numBands);
setUint(setId, _debt);
_eventName = "LogCreateLoan(address,uint256,uint256,uint256)"; _eventName = "LogCreateLoan(address,uint256,uint256,uint256)";
_eventParam = abi.encode(collateral, amt, debt, N); _eventParam = abi.encode(collateral, _amt, debt, numBands, getId, setId);
} }
/** /**
@ -201,6 +212,6 @@ abstract contract MakerResolver is Helpers, Events {
} }
} }
contract ConnectV2CRV is MakerResolver { contract ConnectV2CurveUSD is CurveUSDResolver {
string public constant name = "CRV-USD-v1"; string public constant name = "CurveUSD-v1.0";
} }