From b4feb0467de7fa7b4a8eac5087d02a6295fe2ef4 Mon Sep 17 00:00:00 2001
From: Lecky Lao <leckylao@gmail.com>
Date: Thu, 20 Aug 2020 05:37:44 +1000
Subject: [PATCH] added event and function overloading for withdraw and
 claimReward

---
 contracts/connectors/curve_gauge.sol | 87 +++++++++++++++++++++++++++-
 1 file changed, 86 insertions(+), 1 deletion(-)

diff --git a/contracts/connectors/curve_gauge.sol b/contracts/connectors/curve_gauge.sol
index cad896c..3433232 100644
--- a/contracts/connectors/curve_gauge.sol
+++ b/contracts/connectors/curve_gauge.sol
@@ -62,12 +62,25 @@ contract CurveGauge is GaugeHelper {
     uint setIdReward
   );
 
+  event LogWithdraw(
+    string indexed gaugePoolName,
+    uint amount,
+    uint getId,
+    uint setId,
+    uint setIdCRVReward
+  );
+
   event LogClaimedReward(
     string indexed gaugePoolName,
     uint setId,
     uint setIdReward
   );
 
+  event LogClaimedReward(
+    string indexed gaugePoolName,
+    uint setId
+  );
+
   struct Balances{
     uint intialCRVBal;
     uint intialRewardBal;
@@ -149,7 +162,6 @@ contract CurveGauge is GaugeHelper {
     setUint(setIdReward, balances.rewardAmt);
 
     emitLogWithdraw(gaugePoolName, _amt, getId, setId, setIdCRVReward, setIdReward);
-
   }
 
   function emitLogWithdraw(string memory gaugePoolName, uint _amt, uint getId, uint setId, uint setIdCRVReward, uint setIdReward) internal {
@@ -195,6 +207,79 @@ contract CurveGauge is GaugeHelper {
     bytes memory _eventParam = abi.encode(gaugePoolName, setId, setIdReward);
     emitEvent(_eventCode, _eventParam);
   }
+
+  /**
+  * @dev Withdraw LP Token.
+    * @param gaugePoolName gauge pool name.
+    * @param amt LP token amount.
+    * @param getId Get token amount at this ID from `InstaMemory` Contract.
+    * @param setId Set token amount at this ID in `InstaMemory` Contract.
+    * @param setIdCRVReward Set CRV token reward amount at this ID in `InstaMemory` Contract.
+  */
+  function withdraw(
+    string calldata gaugePoolName,
+    uint amt,
+    uint getId,
+    uint setId,
+    uint setIdCRVReward
+  ) external payable {
+    uint _amt = getUint(getId, amt);
+    address curveGaugeAddr = CurveGaugeMapping(getCurveGaugeMappingAddr())
+      .gaugeMapping(bytes32(stringToBytes32(gaugePoolName)));
+    require(curveGaugeAddr != address(0), "wrong-gauge-pool-name");
+    IGauge gauge = IGauge(curveGaugeAddr);
+    TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
+    Balances memory balances;
+
+    _amt = _amt == uint(-1) ? TokenInterface(address(gauge.lp_token())).balanceOf(address(this)) : _amt;
+    balances.intialCRVBal = crv_token.balanceOf(address(this));
+    IMintor(getCurveMintorAddr()).mint(curveGaugeAddr);
+    gauge.withdraw(_amt);
+    balances.finalCRVBal = crv_token.balanceOf(address(this));
+    balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
+
+    setUint(setId, _amt);
+    setUint(setIdCRVReward, balances.crvRewardAmt);
+
+    emitLogWithdraw(gaugePoolName, _amt, getId, setId, setIdCRVReward);
+  }
+
+  function emitLogWithdraw(string memory gaugePoolName, uint _amt, uint getId, uint setId, uint setIdCRVReward) internal {
+    emit LogWithdraw(gaugePoolName, _amt, getId, setId, setIdCRVReward);
+    bytes32 _eventCodeWithdraw = keccak256("LogWithdraw(string,uint256,uint256,uint256,uint256)");
+    bytes memory _eventParamWithdraw = abi.encode(gaugePoolName, _amt, getId, setId, setIdCRVReward);
+    emitEvent(_eventCodeWithdraw, _eventParamWithdraw);
+  }
+
+  /**
+  * @dev Claim Reward.
+    * @param gaugePoolName gauge pool name.
+    * @param setId Set CRV reward amount at this ID in `InstaMemory` Contract.
+  */
+  function claimReward(
+    string calldata gaugePoolName,
+    uint setId
+  ) external payable {
+    CurveGaugeMapping curveGaugeMapping = CurveGaugeMapping(getCurveGaugeMappingAddr());
+    address curveGaugeAddr = curveGaugeMapping.gaugeMapping(bytes32(stringToBytes32(gaugePoolName)));
+    require(curveGaugeAddr != address(0), "wrong-gauge-pool-name");
+    IMintor mintor = IMintor(getCurveMintorAddr());
+    IGauge gauge = IGauge(curveGaugeAddr);
+    TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
+    Balances memory balances;
+
+    balances.intialCRVBal = crv_token.balanceOf(address(this));
+    mintor.mint(curveGaugeAddr);
+    balances.finalCRVBal = crv_token.balanceOf(address(this));
+    balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
+
+    setUint(setId, balances.crvRewardAmt);
+
+    emit LogClaimedReward(gaugePoolName, setId);
+    bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256)");
+    bytes memory _eventParam = abi.encode(gaugePoolName, setId);
+    emitEvent(_eventCode, _eventParam);
+  }
 }
 
 contract ConnectCurveGauge is CurveGauge {