updates events

This commit is contained in:
pradyuman-verma 2021-12-15 23:03:49 +05:30
parent 2a0a61f1e1
commit f511685a15
No known key found for this signature in database
GPG Key ID: E36FD6BC8923221F
2 changed files with 238 additions and 207 deletions

View File

@ -2,27 +2,37 @@ pragma solidity ^0.7.0;
contract Events {
event LogDeposit(
address token1,
address token2,
uint256 indexed pid,
uint256 indexed version,
uint256 amount
);
event LogWithdraw(
address token1,
address token2,
uint256 indexed pid,
uint256 indexed version,
uint256 amount
);
event LogEmergencyWithdraw(
address token1,
address token2,
uint256 indexed pid,
uint256 indexed version,
uint256 lpAmount,
uint256 rewardsAmount
);
event LogHarvest(
address token1,
address token2,
uint256 indexed pid,
uint256 indexed version,
uint256 amount
);
event LogWithdrawAndHarvest(
address token1,
address token2,
uint256 indexed pid,
uint256 indexed version,
uint256 widrawAmount,

View File

@ -6,9 +6,9 @@ pragma experimental ABIEncoderV2;
* @dev Decentralized Exchange.
*/
import {TokenInterface} from "../../common/interfaces.sol";
import {Helpers} from "./helpers.sol";
import {Events} from "./events.sol";
import { TokenInterface } from "../../common/interfaces.sol";
import { Helpers } from "./helpers.sol";
import { Events } from "./events.sol";
abstract contract SushipswapIncentiveResolver is Helpers, Events {
/**
@ -35,19 +35,26 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount);
if(data.poolId == uint256(-1)|| data.version <= 0 || data.lpToken == address(0)){
data = _getPoolId(
token1,
token2
);
if (
data.poolId == uint256(-1) ||
data.version <= 0 ||
data.lpToken == address(0)
) {
data = _getPoolId(token1, token2);
}
setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist");
TokenInterface lpToken = TokenInterface(data.lpToken);
lpToken.approve(address(masterChef), amount);
_deposit(data, amount);
_eventName = "LogDeposit(uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount);
_eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount
);
}
/**
@ -74,17 +81,20 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount);
if(data.poolId == uint256(-1)|| data.version <= 0){
data = _getPoolId(
token1,
token2
);
if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId(token1, token2);
}
setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist");
_withdraw(data, amount);
_eventName = "LogWithdraw(uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount);
_eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount
);
}
/**
@ -106,19 +116,22 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
{
token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2);
if(data.poolId == uint256(-1)|| data.version <= 0 ){
data = _getPoolId(
token1,
token2
);
if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId(token1, token2);
}
setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist");
(, uint256 rewardsAmount) = _getUserInfo(data);
if (data.version == 2) _harvest(data);
else _withdraw(data, 0);
_eventName = "LogHarvest(uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, rewardsAmount);
_eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
rewardsAmount
);
}
/**
@ -145,18 +158,22 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount);
if(data.poolId == uint256(-1)|| data.version <= 0){
data = _getPoolId(
token1,
token2
);
if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId(token1, token2);
}
setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist");
(, uint256 rewardsAmount) = _getUserInfo(data);
_withdrawAndHarvest(data, amount);
_eventName = "LogWithdrawAndHarvest(uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount, rewardsAmount);
_eventName = "LogWithdrawAndHarvest(address,address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount,
rewardsAmount
);
}
/**
@ -178,18 +195,22 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
{
token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2);
if(data.poolId == uint256(-1)|| data.version <= 0 ){
data = _getPoolId(
token1,
token2
);
if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId(token1, token2);
}
setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist");
(uint256 lpAmount, uint256 rewardsAmount) = _getUserInfo(data);
_emergencyWithdraw(data);
_eventName = "LogEmergencyWithdraw(uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, lpAmount, rewardsAmount);
_eventName = "LogEmergencyWithdraw(address,addressuint256,uint256,uint256,uint256)";
_eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
lpAmount,
rewardsAmount
);
}
}