From b2a31a24c71fab46ac1f476e1671519ad420c1f2 Mon Sep 17 00:00:00 2001 From: Thrilok Kumar Date: Thu, 20 Aug 2020 21:51:54 +0530 Subject: [PATCH] Minor edits --- contracts/connectors/curve_gauge.sol | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contracts/connectors/curve_gauge.sol b/contracts/connectors/curve_gauge.sol index 371b1d1..75fc9f2 100644 --- a/contracts/connectors/curve_gauge.sol +++ b/contracts/connectors/curve_gauge.sol @@ -124,7 +124,9 @@ contract CurveGauge is CurveGaugeEvent { _amt = _amt == uint(-1) ? lp_token.balanceOf(address(this)) : _amt; lp_token.approve(address(curveGaugeData.gaugeAddress), _amt); + gauge.deposit(_amt); + setUint(setId, _amt); emit LogDeposit(gaugePoolName, _amt, getId, setId); @@ -152,7 +154,9 @@ contract CurveGauge is CurveGaugeEvent { ) external payable { uint _amt = getUint(getId, amt); 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"); IGauge gauge = IGauge(curveGaugeData.gaugeAddress); TokenInterface crv_token = TokenInterface(address(gauge.crv_token())); @@ -172,17 +176,17 @@ contract CurveGauge is CurveGaugeEvent { balances.finalCRVBal = crv_token.balanceOf(address(this)); balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal); + setUint(setId, _amt); setUint(setIdCrv, balances.crvRewardAmt); - emitLogWithdraw(gaugePoolName, _amt, getId, setId); - if (curveGaugeData.rewardToken) { balances.finalRewardBal = rewarded_token.balanceOf(address(this)); balances.rewardAmt = sub(balances.finalRewardBal, balances.intialRewardBal); setUint(setIdReward, balances.rewardAmt); } + emitLogWithdraw(gaugePoolName, _amt, getId, setId); emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setIdCrv, setIdReward); } @@ -198,7 +202,9 @@ contract CurveGauge is CurveGaugeEvent { uint setIdReward ) external payable { 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"); IMintor mintor = IMintor(getCurveMintorAddr()); IGauge gauge = IGauge(curveGaugeData.gaugeAddress); @@ -217,6 +223,7 @@ contract CurveGauge is CurveGaugeEvent { balances.finalCRVBal = crv_token.balanceOf(address(this)); balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal); + setUint(setId, balances.crvRewardAmt); if(curveGaugeData.rewardToken){