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

updates events

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/mainnet/connectors/sushi-incentive/events.sol
View File

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

83
contracts/mainnet/connectors/sushi-incentive/main.sol
View File

@ -35,19 +35,26 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1); token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2); token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount); amount = getUint(getId, amount);
if(data.poolId == uint256(-1)|| data.version <= 0 || data.lpToken == address(0)){ if (
data = _getPoolId( data.poolId == uint256(-1) ||
token1, data.version <= 0 ||
token2 data.lpToken == address(0)
); ) {
data = _getPoolId(token1, token2);
} }
setUint(setId, data.poolId); setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist"); require(data.poolId != uint256(-1), "pool-does-not-exist");
TokenInterface lpToken = TokenInterface(data.lpToken); TokenInterface lpToken = TokenInterface(data.lpToken);
lpToken.approve(address(masterChef), amount); lpToken.approve(address(masterChef), amount);
_deposit(data, amount); _deposit(data, amount);
_eventName = "LogDeposit(uint256,uint256,uint256)"; _eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount); _eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount
);
} }
/** /**
@ -75,16 +82,19 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token2 = changeEthAddrToWethAddr(token2); token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount); amount = getUint(getId, amount);
if (data.poolId == uint256(-1) || data.version <= 0) { if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId( data = _getPoolId(token1, token2);
token1,
token2
);
} }
setUint(setId, data.poolId); setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist"); require(data.poolId != uint256(-1), "pool-does-not-exist");
_withdraw(data, amount); _withdraw(data, amount);
_eventName = "LogWithdraw(uint256,uint256,uint256)"; _eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount); _eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount
);
} }
/** /**
@ -107,18 +117,21 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1); token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2); token2 = changeEthAddrToWethAddr(token2);
if (data.poolId == uint256(-1) || data.version <= 0) { if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId( data = _getPoolId(token1, token2);
token1,
token2
);
} }
setUint(setId, data.poolId); setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist"); require(data.poolId != uint256(-1), "pool-does-not-exist");
(, uint256 rewardsAmount) = _getUserInfo(data); (, uint256 rewardsAmount) = _getUserInfo(data);
if (data.version == 2) _harvest(data); if (data.version == 2) _harvest(data);
else _withdraw(data, 0); else _withdraw(data, 0);
_eventName = "LogHarvest(uint256,uint256,uint256)"; _eventName = "LogDeposit(address,address,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, rewardsAmount); _eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
rewardsAmount
);
} }
/** /**
@ -146,17 +159,21 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token2 = changeEthAddrToWethAddr(token2); token2 = changeEthAddrToWethAddr(token2);
amount = getUint(getId, amount); amount = getUint(getId, amount);
if (data.poolId == uint256(-1) || data.version <= 0) { if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId( data = _getPoolId(token1, token2);
token1,
token2
);
} }
setUint(setId, data.poolId); setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist"); require(data.poolId != uint256(-1), "pool-does-not-exist");
(, uint256 rewardsAmount) = _getUserInfo(data); (, uint256 rewardsAmount) = _getUserInfo(data);
_withdrawAndHarvest(data, amount); _withdrawAndHarvest(data, amount);
_eventName = "LogWithdrawAndHarvest(uint256,uint256,uint256,uint256)"; _eventName = "LogWithdrawAndHarvest(address,address,uint256,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, amount, rewardsAmount); _eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
amount,
rewardsAmount
);
} }
/** /**
@ -179,17 +196,21 @@ abstract contract SushipswapIncentiveResolver is Helpers, Events {
token1 = changeEthAddrToWethAddr(token1); token1 = changeEthAddrToWethAddr(token1);
token2 = changeEthAddrToWethAddr(token2); token2 = changeEthAddrToWethAddr(token2);
if (data.poolId == uint256(-1) || data.version <= 0) { if (data.poolId == uint256(-1) || data.version <= 0) {
data = _getPoolId( data = _getPoolId(token1, token2);
token1,
token2
);
} }
setUint(setId, data.poolId); setUint(setId, data.poolId);
require(data.poolId != uint256(-1), "pool-does-not-exist"); require(data.poolId != uint256(-1), "pool-does-not-exist");
(uint256 lpAmount, uint256 rewardsAmount) = _getUserInfo(data); (uint256 lpAmount, uint256 rewardsAmount) = _getUserInfo(data);
_emergencyWithdraw(data); _emergencyWithdraw(data);
_eventName = "LogEmergencyWithdraw(uint256,uint256,uint256,uint256)"; _eventName = "LogEmergencyWithdraw(address,addressuint256,uint256,uint256,uint256)";
_eventParam = abi.encode(data.poolId, data.version, lpAmount, rewardsAmount); _eventParam = abi.encode(
token1,
token2,
data.poolId,
data.version,
lpAmount,
rewardsAmount
);
} }
} }