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

Merge branch 'curve-gauge-connector-feature' of github.com:InstaDApp/dsa-connectors into curve-gauge-connector-feature

Browse Source
This commit is contained in:
Lecky Lao 2020-08-21 03:38:56 +10:00
commit 97832c28a4
2 changed files with 44 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
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( event LogDeposit(
string indexed gaugePoolName, string indexed gaugePoolName,
uint amount, uint amount,
@ -75,12 +75,22 @@ contract CurveGauge is GaugeHelper {
uint setIdReward uint setIdReward
); );
event LogClaimedReward( function emitLogWithdraw(string memory gaugePoolName, uint _amt, uint getId, uint setId) internal {
string indexed gaugePoolName, emit LogWithdraw(gaugePoolName, _amt, getId, setId);
uint amount, bytes32 _eventCodeWithdraw = keccak256("LogWithdraw(string,uint256,uint256,uint256)");
uint setId 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{ struct Balances{
uint intialCRVBal; uint intialCRVBal;
uint intialRewardBal; uint intialRewardBal;
@ -105,14 +115,18 @@ contract CurveGauge is GaugeHelper {
) 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 lp_token = TokenInterface(address(gauge.lp_token())); TokenInterface lp_token = TokenInterface(address(gauge.lp_token()));
_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);
@ -127,7 +141,7 @@ contract CurveGauge is GaugeHelper {
* @param amt LP token amount. * @param amt LP token amount.
* @param getId Get token amount at this ID from `InstaMemory` Contract. * @param getId Get token amount at this ID from `InstaMemory` Contract.
* @param setId Set token amount at this ID in `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. * @param setIdReward Set reward amount at this ID in `InstaMemory` Contract.
*/ */
function withdraw( function withdraw(
@ -135,22 +149,25 @@ contract CurveGauge is GaugeHelper {
uint amt, uint amt,
uint getId, uint getId,
uint setId, uint setId,
uint setIdCRVReward, uint setIdCrv,
uint setIdReward uint setIdReward
) 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()));
TokenInterface rewarded_token;
Balances memory balances; Balances memory balances;
_amt = _amt == uint(-1) ? gauge.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? gauge.balanceOf(address(this)) : _amt;
balances.intialCRVBal = crv_token.balanceOf(address(this)); balances.intialCRVBal = crv_token.balanceOf(address(this));
if(curveGaugeData.rewardToken == true){ if (curveGaugeData.rewardToken) {
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token())); rewarded_token = TokenInterface(address(gauge.rewarded_token()));
balances.intialRewardBal = rewarded_token.balanceOf(address(this)); balances.intialRewardBal = rewarded_token.balanceOf(address(this));
} }
@ -159,40 +176,18 @@ contract CurveGauge is GaugeHelper {
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(setIdCRVReward, balances.crvRewardAmt); setUint(setIdCrv, balances.crvRewardAmt);
emitLogWithdraw(gaugePoolName, _amt, getId, setId); if (curveGaugeData.rewardToken) {
if(curveGaugeData.rewardToken == true){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
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);
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);
} }
}
/** emitLogWithdraw(gaugePoolName, _amt, getId, setId);
* @dev emit LogWithdraw event emitLogClaimedReward(gaugePoolName, balances.crvRewardAmt, balances.rewardAmt, setIdCrv, setIdReward);
* @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);
} }
/** /**
@ -207,15 +202,18 @@ contract CurveGauge is GaugeHelper {
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);
TokenInterface crv_token = TokenInterface(address(gauge.crv_token())); TokenInterface crv_token = TokenInterface(address(gauge.crv_token()));
TokenInterface rewarded_token;
Balances memory balances; Balances memory balances;
if(curveGaugeData.rewardToken == true){ if (curveGaugeData.rewardToken) {
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token())); rewarded_token = TokenInterface(address(gauge.rewarded_token()));
balances.intialRewardBal = rewarded_token.balanceOf(address(this)); balances.intialRewardBal = rewarded_token.balanceOf(address(this));
} }
@ -225,23 +223,16 @@ contract CurveGauge is GaugeHelper {
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 == true){ if(curveGaugeData.rewardToken){
TokenInterface rewarded_token = TokenInterface(address(gauge.rewarded_token()));
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);
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);
} }
} }

16
contracts/mapping/curve_gauge_mapping.sol
View File

@ -20,22 +20,6 @@ contract BytesHelper {
result := mload(add(str, 32)) result := mload(add(str, 32))
} }
} }
function bytes32ToString(bytes32 _bytes32) internal pure returns (string memory) {
bytes32 _temp;
uint count;
for (uint256 i; i < 32; i++) {
_temp = _bytes32[i];
if( _temp != bytes32(0)) {
count += 1;
}
}
bytes memory bytesArray = new bytes(count);
for (uint256 i; i < count; i++) {
bytesArray[i] = (_bytes32[i]);
}
return (string(bytesArray));
}
} }
contract Helpers is BytesHelper { contract Helpers is BytesHelper {