Merge pull request #77 from Instadapp/guni-inst-stake

Update GUNI staking connector
This commit is contained in:
Thrilok kumar 2021-09-14 14:38:33 +05:30 committed by GitHub
commit 9c0dc26261
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 24 deletions

View File

@ -3,14 +3,14 @@ pragma solidity ^0.7.0;
contract Events { contract Events {
event LogDeposit( event LogDeposit(
address indexed stakingToken, address indexed stakingPool,
uint256 amount, uint256 amount,
uint getId, uint getId,
uint setId uint setId
); );
event LogWithdrawAndClaimedReward( event LogWithdrawAndClaimedReward(
address indexed stakingToken, address indexed stakingPool,
uint256 amount, uint256 amount,
uint256 rewardAmt, uint256 rewardAmt,
uint getId, uint getId,
@ -19,6 +19,7 @@ contract Events {
); );
event LogClaimedReward( event LogClaimedReward(
address indexed stakingPool,
address indexed rewardToken, address indexed rewardToken,
uint256 rewardAmt, uint256 rewardAmt,
uint setId uint setId

View File

@ -8,17 +8,5 @@ import { TokenInterface } from "../../common/interfaces.sol";
import { IStakingRewards, IStakingRewardsFactory, IGUniPoolResolver } from "./interface.sol"; import { IStakingRewards, IStakingRewardsFactory, IGUniPoolResolver } from "./interface.sol";
abstract contract Helpers is DSMath, Basic { abstract contract Helpers is DSMath, Basic {
IGUniPoolResolver constant internal guniResolver =
IGUniPoolResolver(0x729BF02a9A786529Fc80498f8fd0051116061B13);
TokenInterface constant internal rewardToken = TokenInterface(0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb); TokenInterface constant internal rewardToken = TokenInterface(0x6f40d4A6237C257fff2dB00FA0510DeEECd303eb);
function getStakingContract(address stakingToken) internal view returns (address) {
IStakingRewardsFactory.StakingRewardsInfo memory stakingRewardsInfo =
guniResolver.getStakingFactory().stakingRewardsInfoByStakingToken(stakingToken);
return stakingRewardsInfo.stakingRewards;
}
} }

View File

@ -17,12 +17,14 @@ contract Main is Helpers, Events {
/** /**
* @dev Deposit ERC20. * @dev Deposit ERC20.
* @notice Deposit Tokens to staking pool. * @notice Deposit Tokens to staking pool.
* @param stakingPool staking pool address.
* @param stakingToken staking token address. * @param stakingToken staking token address.
* @param amt staking token amount. * @param amt staking token amount.
* @param getId ID to retrieve amount. * @param getId ID to retrieve amount.
* @param setId ID stores the amount of staked tokens. * @param setId ID stores the amount of staked tokens.
*/ */
function deposit( function deposit(
address stakingPool,
address stakingToken, address stakingToken,
uint amt, uint amt,
uint getId, uint getId,
@ -30,7 +32,7 @@ contract Main is Helpers, Events {
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
IStakingRewards stakingContract = IStakingRewards(getStakingContract(stakingToken)); IStakingRewards stakingContract = IStakingRewards(stakingPool);
TokenInterface stakingTokenContract = TokenInterface(stakingToken); TokenInterface stakingTokenContract = TokenInterface(stakingToken);
_amt = _amt == uint(-1) ? stakingTokenContract.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? stakingTokenContract.balanceOf(address(this)) : _amt;
@ -40,12 +42,13 @@ contract Main is Helpers, Events {
setUint(setId, _amt); setUint(setId, _amt);
_eventName = "LogDeposit(address,uint256,uint256,uint256)"; _eventName = "LogDeposit(address,uint256,uint256,uint256)";
_eventParam = abi.encode(address(stakingToken), _amt, getId, setId); _eventParam = abi.encode(address(stakingPool), _amt, getId, setId);
} }
/** /**
* @dev Withdraw ERC20. * @dev Withdraw ERC20.
* @notice Withdraw Tokens from the staking pool. * @notice Withdraw Tokens from the staking pool.
* @param stakingPool staking pool address.
* @param stakingToken staking token address. * @param stakingToken staking token address.
* @param amt staking token amount. * @param amt staking token amount.
* @param getId ID to retrieve amount. * @param getId ID to retrieve amount.
@ -53,6 +56,7 @@ contract Main is Helpers, Events {
* @param setIdReward ID stores the amount of reward tokens claimed. * @param setIdReward ID stores the amount of reward tokens claimed.
*/ */
function withdraw( function withdraw(
address stakingPool,
address stakingToken, address stakingToken,
uint amt, uint amt,
uint getId, uint getId,
@ -61,7 +65,7 @@ contract Main is Helpers, Events {
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
uint _amt = getUint(getId, amt); uint _amt = getUint(getId, amt);
IStakingRewards stakingContract = IStakingRewards(getStakingContract(stakingToken)); IStakingRewards stakingContract = IStakingRewards(stakingPool);
_amt = _amt == uint(-1) ? stakingContract.balanceOf(address(this)) : _amt; _amt = _amt == uint(-1) ? stakingContract.balanceOf(address(this)) : _amt;
uint intialBal = rewardToken.balanceOf(address(this)); uint intialBal = rewardToken.balanceOf(address(this));
@ -74,21 +78,21 @@ contract Main is Helpers, Events {
setUint(setIdReward, rewardAmt); setUint(setIdReward, rewardAmt);
{ {
_eventName = "LogWithdrawAndClaimedReward(address,uint256,uint256,uint256,uint256,uint256)"; _eventName = "LogWithdrawAndClaimedReward(address,uint256,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(address(stakingToken), _amt, rewardAmt, getId, setIdAmount, setIdReward); _eventParam = abi.encode(address(stakingPool), _amt, rewardAmt, getId, setIdAmount, setIdReward);
} }
} }
/** /**
* @dev Claim Reward. * @dev Claim Reward.
* @notice Claim Pending Rewards of tokens staked. * @notice Claim Pending Rewards of tokens staked.
* @param stakingToken staking token address. * @param stakingPool staking pool address.
* @param setId ID stores the amount of reward tokens claimed. * @param setId ID stores the amount of reward tokens claimed.
*/ */
function claimReward( function claimReward(
address stakingToken, address stakingPool,
uint setId uint setId
) external payable returns (string memory _eventName, bytes memory _eventParam) { ) external payable returns (string memory _eventName, bytes memory _eventParam) {
IStakingRewards stakingContract = IStakingRewards(getStakingContract(stakingToken)); IStakingRewards stakingContract = IStakingRewards(stakingPool);
uint intialBal = rewardToken.balanceOf(address(this)); uint intialBal = rewardToken.balanceOf(address(this));
stakingContract.getReward(); stakingContract.getReward();
@ -97,12 +101,12 @@ contract Main is Helpers, Events {
uint rewardAmt = sub(finalBal, intialBal); uint rewardAmt = sub(finalBal, intialBal);
setUint(setId, rewardAmt); setUint(setId, rewardAmt);
_eventName = "LogClaimedReward(address,uint256,uint256)"; _eventName = "LogClaimedReward(address,address,uint256,uint256)";
_eventParam = abi.encode(address(rewardToken), rewardAmt, setId); _eventParam = abi.encode(address(stakingPool), address(rewardToken), rewardAmt, setId);
} }
} }
contract connectV2StakeGUNI is Main { contract connectV2StakeGUNI is Main {
string public constant name = "Stake-G-UNI-v1.0"; string public constant name = "Stake-G-UNI-v1.1";
} }