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

Code refactoring

Browse Source
This commit is contained in:
Thrilok Kumar 2020-08-20 21:46:41 +05:30
parent 8a9ce14a9d
commit 058fc7d8f5
1 changed files with 33 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
contracts/connectors/curve_gauge.sol
View File

@ -52,7 +52,7 @@ contract GaugeHelper is DSMath, Stores{
}
}
contract CurveGauge is GaugeHelper {
contract CurveGaugeEvent is GaugeHelper {
event LogDeposit(
string indexed gaugePoolName,
uint amount,
@ -75,12 +75,22 @@ contract CurveGauge is GaugeHelper {
uint setIdReward
);
event LogClaimedReward(
string indexed gaugePoolName,
uint amount,
uint setId
);
function emitLogWithdraw(string memory gaugePoolName, uint _amt, uint getId, uint setId) internal {
emit LogWithdraw(gaugePoolName, _amt, getId, setId);
bytes32 _eventCodeWithdraw = keccak256("LogWithdraw(string,uint256,uint256,uint256)");
bytes memory _eventParamWithdraw = abi.encode(gaugePoolName, _amt, getId, setId);
emitEvent(_eventCodeWithdraw, _eventParamWithdraw);
}
function emitLogClaimedReward(string memory gaugePoolName, uint crvAmt, uint rewardAmt, uint setIdCrv, uint setIdReward) internal {
emit LogClaimedReward(gaugePoolName, crvAmt, rewardAmt, setIdCrv, setIdReward);
bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256,uint256,uint256)");
bytes memory _eventParam = abi.encode(gaugePoolName, crvAmt, rewardAmt, setIdCrv, setIdReward);
emitEvent(_eventCode, _eventParam);
}
}
contract CurveGauge is CurveGaugeEvent {
struct Balances{
uint intialCRVBal;
uint intialRewardBal;
@ -105,7 +115,9 @@ contract CurveGauge is GaugeHelper {
) 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 lp_token = TokenInterface(address(gauge.lp_token()));
@ -127,7 +139,7 @@ contract CurveGauge is GaugeHelper {
* @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.
* @param setIdCrv Set CRV token reward amount at this ID in `InstaMemory` Contract.
* @param setIdReward Set reward amount at this ID in `InstaMemory` Contract.
*/
function withdraw(
@ -135,7 +147,7 @@ contract CurveGauge is GaugeHelper {
uint amt,
uint getId,
uint setId,
uint setIdCRVReward,
uint setIdCrv,
uint setIdReward
) external payable {
uint _amt = getUint(getId, amt);
@ -144,13 +156,14 @@ contract CurveGauge is GaugeHelper {
require(curveGaugeData.gaugeAddress != address(0), "wrong-gauge-pool-name");
IGauge gauge = IGauge(curveGaugeData.gaugeAddress);
TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
TokenInterface rewarded_token;
Balances memory balances;
_amt = _amt == uint(-1) ? gauge.balanceOf(address(this)) : _amt;
balances.intialCRVBal = crv_token.balanceOf(address(this));
if(curveGaugeData.rewardToken == true){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
if (curveGaugeData.rewardToken) {
rewarded_token = TokenInterface(address(gauge.rewarded_token()));
balances.intialRewardBal = rewarded_token.balanceOf(address(this));
}
@ -160,39 +173,17 @@ contract CurveGauge is GaugeHelper {
balances.finalCRVBal = crv_token.balanceOf(address(this));
balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
setUint(setId, _amt);
setUint(setIdCRVReward, balances.crvRewardAmt);
setUint(setIdCrv, balances.crvRewardAmt);
emitLogWithdraw(gaugePoolName, _amt, getId, setId);
if(curveGaugeData.rewardToken == true){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
if (curveGaugeData.rewardToken) {
balances.finalRewardBal = rewarded_token.balanceOf(address(this));
balances.rewardAmt = sub(balances.finalRewardBal, balances.intialRewardBal);
setUint(setIdReward, balances.rewardAmt);
emit LogClaimedReward(gaugePoolName, balances.crvRewardAmt, setIdCRVReward, balances.rewardAmt, setIdReward);
bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256,uint256,uint256)");
bytes memory _eventParam = abi.encode(gaugePoolName, balances.crvRewardAmt, setIdCRVReward, balances.rewardAmt, setIdReward);
emitEvent(_eventCode, _eventParam);
}else{
emit LogClaimedReward(gaugePoolName, balances.crvRewardAmt, setIdCRVReward);
bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256");
bytes memory _eventParam = abi.encode(gaugePoolName, balances.crvRewardAmt, setIdCRVReward);
emitEvent(_eventCode, _eventParam);
}
}
/**
* @dev emit LogWithdraw event
* @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.
*/
function emitLogWithdraw(string memory gaugePoolName, uint _amt, uint getId, uint setId) internal {
emit LogWithdraw(gaugePoolName, _amt, getId, setId);
bytes32 _eventCodeWithdraw = keccak256("LogWithdraw(string,uint256,uint256,uint256)");
bytes memory _eventParamWithdraw = abi.encode(gaugePoolName, _amt, getId, setId);
emitEvent(_eventCodeWithdraw, _eventParamWithdraw);
emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setIdCrv, setIdReward);
}
/**
@ -212,10 +203,11 @@ contract CurveGauge is GaugeHelper {
IMintor mintor = IMintor(getCurveMintorAddr());
IGauge gauge = IGauge(curveGaugeData.gaugeAddress);
TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
TokenInterface rewarded_token;
Balances memory balances;
if(curveGaugeData.rewardToken == true){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
if (curveGaugeData.rewardToken) {
rewarded_token = TokenInterface(address(gauge.rewarded_token()));
balances.intialRewardBal = rewarded_token.balanceOf(address(this));
}
@ -227,21 +219,13 @@ contract CurveGauge is GaugeHelper {
balances.crvRewardAmt = sub(balances.finalCRVBal, balances.intialCRVBal);
setUint(setId, balances.crvRewardAmt);
if(curveGaugeData.rewardToken == true){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
if(curveGaugeData.rewardToken){
balances.finalRewardBal = rewarded_token.balanceOf(address(this));
balances.rewardAmt = sub(balances.finalRewardBal, balances.intialRewardBal);
setUint(setIdReward, balances.rewardAmt);
emit LogClaimedReward(gaugePoolName, balances.crvRewardAmt, setId, balances.rewardAmt, setIdReward);
bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256,uint256,uint256)");
bytes memory _eventParam = abi.encode(gaugePoolName, balances.crvRewardAmt, setId, balances.rewardAmt, setIdReward);
emitEvent(_eventCode, _eventParam);
}else{
emit LogClaimedReward(gaugePoolName, balances.crvRewardAmt, setId);
bytes32 _eventCode = keccak256("LogClaimedReward(string,uint256,uint256");
bytes memory _eventParam = abi.encode(gaugePoolName, balances.crvRewardAmt, setId);
emitEvent(_eventCode, _eventParam);
}
emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setId, setIdReward);
}
}