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

Minor changes

Browse Source
This commit is contained in:
Thrilok Kumar 2021-09-08 00:00:48 +05:30
parent 73969113c5
commit e62e0cfea8
3 changed files with 21 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/mainnet/connectors/uniswap/v3_staker/events.sol
View File

@ -3,21 +3,21 @@ pragma solidity ^0.7.0;
contract Events { contract Events {
event LogDeposit(uint256 tokenId); event LogDeposit(uint256 tokenId);
event LogWithdraw(uint256 indexed tokenId, address to); event LogWithdraw(uint256 indexed tokenId);
event LogDepositTransfer(uint256 indexed tokenId, address to); event LogDepositTransfer(uint256 indexed tokenId, address to);
event LogStake(uint256 tokenId, address refundee); event LogStake(uint256 indexed tokenId, bytes32 incentiveId);
event LogUnstake(uint256 tokenId, bytes32 incentiveId); event LogUnstake(uint256 indexed tokenId, bytes32 incentiveId);
event LogRewardClaimed( event LogRewardClaimed(
address rewardToken, address indexed rewardToken,
address receiver,
uint256 amount uint256 amount
); );
event LogIncentiveCreated( event LogIncentiveCreated(
bytes32 incentiveId,
address poolAddr, address poolAddr,
address refundee, address refundee,
uint256 startTime, uint256 startTime,

36
contracts/mainnet/connectors/uniswap/v3_staker/helpers.sol
View File

@ -32,42 +32,6 @@ abstract contract Helpers is DSMath, Basic {
tokenId = nftManager.tokenOfOwnerByIndex(user, len - 1); tokenId = nftManager.tokenOfOwnerByIndex(user, len - 1);
} }
function getMinAmount(
TokenInterface token,
uint256 amt,
uint256 slippage
) internal view returns (uint256 minAmt) {
uint256 _amt18 = convertTo18(token.decimals(), amt);
minAmt = wmul(_amt18, sub(WAD, slippage));
minAmt = convert18ToDec(token.decimals(), minAmt);
}
function getNftTokenPairAddresses(uint256 _tokenId)
internal
view
returns (address token0, address token1)
{
(bool success, bytes memory data) = address(nftManager).staticcall(
abi.encodeWithSelector(nftManager.positions.selector, _tokenId)
);
require(success, "fetching positions failed");
{
(, , token0, token1, , , , ) = abi.decode(
data,
(
uint96,
address,
address,
address,
uint24,
int24,
int24,
uint128
)
);
}
}
function getPoolAddress(uint256 _tokenId) function getPoolAddress(uint256 _tokenId)
internal internal
view view

35
contracts/mainnet/connectors/uniswap/v3_staker/main.sol
View File

@ -6,7 +6,7 @@ pragma abicoder v2;
* @dev Decentralized Exchange. * @dev Decentralized Exchange.
*/ */
import {TokenInterface} from "../../common/interfaces.sol"; import {TokenInterface} from "../../../common/interfaces.sol";
import "./interface.sol"; import "./interface.sol";
import {Helpers} from "./helpers.sol"; import {Helpers} from "./helpers.sol";
import {Events} from "./events.sol"; import {Events} from "./events.sol";
@ -56,18 +56,17 @@ abstract contract UniswapResolver is Helpers, Events {
* @dev Withdraw NFT LP token * @dev Withdraw NFT LP token
* @notice Withdraw NFT LP token from staking pool * @notice Withdraw NFT LP token from staking pool
* @param _tokenId NFT LP Token ID * @param _tokenId NFT LP Token ID
* @param _to address to transfer
*/ */
function withdraw(uint256 _tokenId, address _to) function withdraw(uint256 _tokenId)
external external
payable payable
returns (string memory _eventName, bytes memory _eventParam) returns (string memory _eventName, bytes memory _eventParam)
{ {
if (_tokenId == 0) _tokenId = _getLastNftId(address(this)); if (_tokenId == 0) _tokenId = _getLastNftId(address(this));
staker.withdrawToken(_tokenId, _to, ""); staker.withdrawToken(_tokenId, address(this), "");
_eventName = "LogWithdraw(uint256,address)"; _eventName = "LogWithdraw(uint256)";
_eventParam = abi.encode(_tokenId, _to); _eventParam = abi.encode(_tokenId);
} }
/** /**
@ -104,8 +103,8 @@ abstract contract UniswapResolver is Helpers, Events {
); );
_stake(_tokenId, _key); _stake(_tokenId, _key);
_eventName = "LogStake(uint256,address)"; _eventName = "LogStake(uint256,bytes32)";
_eventParam = abi.encode(_tokenId, _refundee); _eventParam = abi.encode(_tokenId, keccak256(abi.encode(_key)));
} }
/** /**
@ -142,20 +141,18 @@ abstract contract UniswapResolver is Helpers, Events {
); );
_unstake(_key, _tokenId); _unstake(_key, _tokenId);
_eventName = "LogUnstake(uint256,bytes32)"; _eventName = "LogUnstake(uint256,bytes32)";
_eventParam = abi.encode(_tokenId, _key); _eventParam = abi.encode(_tokenId, keccak256(abi.encode(_key)));
} }
/** /**
* @dev Claim rewards * @dev Claim rewards
* @notice Claim rewards * @notice Claim rewards
* @param _rewardToken _rewardToken address * @param _rewardToken _rewardToken address
* @param _to address to receive * @param _amount requested amount
* @param _amountRequested requested amount
*/ */
function claimRewards( function claimRewards(
address _rewardToken, address _rewardToken,
address _to, uint256 _amount
uint256 _amountRequested
) )
external external
payable payable
@ -163,12 +160,12 @@ abstract contract UniswapResolver is Helpers, Events {
{ {
uint256 rewards = _claimRewards( uint256 rewards = _claimRewards(
IERC20Minimal(_rewardToken), IERC20Minimal(_rewardToken),
_to, address(this),
_amountRequested _amount
); );
_eventName = "LogRewardClaimed(address,address,uint256)"; _eventName = "LogRewardClaimed(address,uint256)";
_eventParam = abi.encode(_rewardToken, _to, rewards); _eventParam = abi.encode(_rewardToken, rewards);
} }
/** /**
@ -207,8 +204,8 @@ abstract contract UniswapResolver is Helpers, Events {
} }
staker.createIncentive(_key, _reward); staker.createIncentive(_key, _reward);
_eventName = "LogIncentiveCreated(address,uint256,uint256,uint256)"; _eventName = "LogIncentiveCreated(bytes32,address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(_poolAddr, _startTime, _endTime, _reward); _eventParam = abi.encode(keccak256(abi.encode(_key)), _poolAddr, _refundee, _startTime, _endTime, _reward);
} }
} }