Minor edits

This commit is contained in:
Thrilok Kumar 2020-08-20 21:51:54 +05:30
parent 058fc7d8f5
commit b2a31a24c7

View File

@ -124,7 +124,9 @@ contract CurveGauge is CurveGaugeEvent {
_amt = _amt == uint(-1) ? lp_token.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? lp_token.balanceOf(address(this)) : _amt;
lp_token.approve(address(curveGaugeData.gaugeAddress), _amt); lp_token.approve(address(curveGaugeData.gaugeAddress), _amt);
gauge.deposit(_amt); gauge.deposit(_amt);
setUint(setId, _amt); setUint(setId, _amt);
emit LogDeposit(gaugePoolName, _amt, getId, setId); emit LogDeposit(gaugePoolName, _amt, getId, setId);
@ -152,7 +154,9 @@ contract CurveGauge is CurveGaugeEvent {
) external payable { ) external payable {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
ICurveGaugeMapping curveGaugeMapping = ICurveGaugeMapping(getCurveGaugeMappingAddr()); ICurveGaugeMapping curveGaugeMapping = ICurveGaugeMapping(getCurveGaugeMappingAddr());
ICurveGaugeMapping.GaugeData memory curveGaugeData = curveGaugeMapping.gaugeMapping(bytes32(stringToBytes32(gaugePoolName))); ICurveGaugeMapping.GaugeData memory curveGaugeData = curveGaugeMapping.gaugeMapping(
bytes32(stringToBytes32(gaugePoolName))
);
require(curveGaugeData.gaugeAddress != address(0), "wrong-gauge-pool-name"); require(curveGaugeData.gaugeAddress != address(0), "wrong-gauge-pool-name");
IGauge gauge = IGauge(curveGaugeData.gaugeAddress); IGauge gauge = IGauge(curveGaugeData.gaugeAddress);
TokenInterface crv_token = TokenInterface(address(gauge.crv_token())); TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
@ -172,17 +176,17 @@ contract CurveGauge is CurveGaugeEvent {
balances.finalCRVBal = crv_token.balanceOf(address(this)); balances.finalCRVBal = crv_token.balanceOf(address(this));
balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal); balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
setUint(setId, _amt); setUint(setId, _amt);
setUint(setIdCrv, balances.crvRewardAmt); setUint(setIdCrv, balances.crvRewardAmt);
emitLogWithdraw(gaugePoolName, _amt, getId, setId);
if (curveGaugeData.rewardToken) { if (curveGaugeData.rewardToken) {
balances.finalRewardBal = rewarded_token.balanceOf(address(this)); balances.finalRewardBal = rewarded_token.balanceOf(address(this));
balances.rewardAmt = sub(balances.finalRewardBal, balances.intialRewardBal); balances.rewardAmt = sub(balances.finalRewardBal, balances.intialRewardBal);
setUint(setIdReward, balances.rewardAmt); setUint(setIdReward, balances.rewardAmt);
} }
emitLogWithdraw(gaugePoolName, _amt, getId, setId);
emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setIdCrv, setIdReward); emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setIdCrv, setIdReward);
} }
@ -198,7 +202,9 @@ contract CurveGauge is CurveGaugeEvent {
uint setIdReward uint setIdReward
) external payable { ) external payable {
ICurveGaugeMapping curveGaugeMapping = ICurveGaugeMapping(getCurveGaugeMappingAddr()); ICurveGaugeMapping curveGaugeMapping = ICurveGaugeMapping(getCurveGaugeMappingAddr());
ICurveGaugeMapping.GaugeData memory curveGaugeData = curveGaugeMapping.gaugeMapping(bytes32(stringToBytes32(gaugePoolName))); ICurveGaugeMapping.GaugeData memory curveGaugeData = curveGaugeMapping.gaugeMapping(
bytes32(stringToBytes32(gaugePoolName))
);
require(curveGaugeData.gaugeAddress != address(0), "wrong-gauge-pool-name"); require(curveGaugeData.gaugeAddress != address(0), "wrong-gauge-pool-name");
IMintor mintor = IMintor(getCurveMintorAddr()); IMintor mintor = IMintor(getCurveMintorAddr());
IGauge gauge = IGauge(curveGaugeData.gaugeAddress); IGauge gauge = IGauge(curveGaugeData.gaugeAddress);
@ -217,6 +223,7 @@ contract CurveGauge is CurveGaugeEvent {
balances.finalCRVBal = crv_token.balanceOf(address(this)); balances.finalCRVBal = crv_token.balanceOf(address(this));
balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal); balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
setUint(setId, balances.crvRewardAmt); setUint(setId, balances.crvRewardAmt);
if(curveGaugeData.rewardToken){ if(curveGaugeData.rewardToken){