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

Minor change in event logs.

Browse Source
This commit is contained in:
Sowmayjain 2019-01-04 01:08:24 +05:30
parent 44bf1ae471
commit 6fcf5b9b7d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contracts/protocols/MakerDAO/MakerResolver.sol
View File

@ -1,5 +1,4 @@
// Resolver to Wipe & Coll CDP // Resolver to Wipe & Coll any CDP
pragma solidity 0.4.24; pragma solidity 0.4.24;
@ -102,7 +101,7 @@ contract Helper is Registry {
contract Lock is Helper { contract Lock is Helper {
event LockedETH(address lockedBy, uint lockETH, uint lockPETH); event LockedETH(uint cdpNum, address lockedBy, uint lockETH, uint lockPETH);
function lockETH(uint cdpNum) public payable { function lockETH(uint cdpNum) public payable {
MakerCDP loanMaster = MakerCDP(cdpAddr); MakerCDP loanMaster = MakerCDP(cdpAddr);
@ -111,7 +110,9 @@ contract Lock is Helper {
uint pethToLock = pethPEReth(msg.value); uint pethToLock = pethPEReth(msg.value);
loanMaster.join(pethToLock); // WETH to PETH loanMaster.join(pethToLock); // WETH to PETH
loanMaster.lock(bytes32(cdpNum), pethToLock); // PETH to CDP loanMaster.lock(bytes32(cdpNum), pethToLock); // PETH to CDP
emit LockedETH(msg.sender, msg.value, pethToLock); emit LockedETH(
cdpNum, msg.sender, msg.value, pethToLock
);
} }
} }
@ -119,9 +120,9 @@ contract Lock is Helper {
contract Wipe is Lock { contract Wipe is Lock {
event WipedDAI(address wipedBy, uint daiWipe, uint mkrCharged); event WipedDAI(uint cdpNum, address wipedBy, uint daiWipe, uint mkrCharged);
function wipeDAI(uint daiWipe, uint cdpNum) public payable { function wipeDAI(uint cdpNum, uint daiWipe) public payable {
address dai = getAddress("dai"); address dai = getAddress("dai");
address mkr = getAddress("mkr"); address mkr = getAddress("mkr");
address eth = getAddress("eth"); address eth = getAddress("eth");
@ -144,7 +145,9 @@ contract Wipe is Lock {
mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees mkrTkn.transferFrom(msg.sender, address(this), mkrCharged); // user paying MKR fees
} }
emit WipedDAI(msg.sender, daiWipe, mkrCharged); emit WipedDAI(
cdpNum, msg.sender, daiWipe, mkrCharged
);
} }
function swapETHMKR( function swapETHMKR(