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

MakerDAO minor changes

Browse Source
This commit is contained in:
Thrilok Kumar 2021-03-21 01:02:23 +05:30
parent 742eaac571
commit a615f19b2d
1 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
contracts/connectors/makerdao/main.sol
View File

@ -23,7 +23,7 @@ abstract contract MakerResolver is Helpers, Events {
* @dev Close Vault * @dev Close Vault
* @param vault Vault ID to close. * @param vault Vault ID to close.
*/ */
function close(uint vault) external payable returns (string memory _eventName, bytes memory _eventParam) { function close(uint256 vault) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _vault = getVault(vault); uint _vault = getVault(vault);
(bytes32 ilk, address urn) = getVaultData(_vault); (bytes32 ilk, address urn) = getVaultData(_vault);
(uint ink, uint art) = VatLike(managerContract.vat()).urns(ilk, urn); (uint ink, uint art) = VatLike(managerContract.vat()).urns(ilk, urn);
@ -45,10 +45,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function deposit( function deposit(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
uint _vault = getVault(vault); uint _vault = getVault(vault);
@ -91,10 +91,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function withdraw( function withdraw(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
uint _vault = getVault(vault); uint _vault = getVault(vault);
@ -146,10 +146,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function borrow( function borrow(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
uint _vault = getVault(vault); uint _vault = getVault(vault);
@ -194,10 +194,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function payback( function payback(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
uint _vault = getVault(vault); uint _vault = getVault(vault);
@ -239,10 +239,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function withdrawLiquidated( function withdrawLiquidated(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
(bytes32 ilk, address urn) = getVaultData(vault); (bytes32 ilk, address urn) = getVaultData(vault);
@ -294,13 +294,13 @@ abstract contract MakerResolver is Helpers, Events {
* @param setIdBorrow Set borrow token amount at this ID in `InstaMemory` Contract. * @param setIdBorrow Set borrow token amount at this ID in `InstaMemory` Contract.
*/ */
function depositAndBorrow( function depositAndBorrow(
uint vault, uint256 vault,
uint depositAmt, uint256 depositAmt,
uint borrowAmt, uint256 borrowAmt,
uint getIdDeposit, uint256 getIdDeposit,
uint getIdBorrow, uint256 getIdBorrow,
uint setIdDeposit, uint256 setIdDeposit,
uint setIdBorrow uint256 setIdBorrow
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
MakerData memory makerData; MakerData memory makerData;
uint _amtDeposit = getUint(getIdDeposit, depositAmt); uint _amtDeposit = getUint(getIdDeposit, depositAmt);
@ -350,10 +350,6 @@ abstract contract MakerResolver is Helpers, Events {
setUint(setIdDeposit, _amtDeposit); setUint(setIdDeposit, _amtDeposit);
setUint(setIdBorrow, _amtBorrow); setUint(setIdBorrow, _amtBorrow);
emit LogDeposit(makerData._vault, ilk, _amtDeposit, getIdDeposit, setIdDeposit);
emit LogBorrow(makerData._vault, ilk, _amtBorrow, getIdBorrow, setIdBorrow);
_eventName = "LogDepositAndBorrow(uint256,bytes32,uint256,uint256,uint256,uint256,uint256,uint256)"; _eventName = "LogDepositAndBorrow(uint256,bytes32,uint256,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(
makerData._vault, makerData._vault,
@ -375,10 +371,10 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function exitDai( function exitDai(
uint vault, uint256 vault,
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
uint _vault = getVault(vault); uint _vault = getVault(vault);
@ -415,9 +411,9 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function depositDai( function depositDai(
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
@ -448,9 +444,9 @@ abstract contract MakerResolver is Helpers, Events {
* @param setId Set token amount at this ID in `InstaMemory` Contract. * @param setId Set token amount at this ID in `InstaMemory` Contract.
*/ */
function withdrawDai( function withdrawDai(
uint amt, uint256 amt,
uint getId, uint256 getId,
uint setId uint256 setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);