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

fix: eventsParams

Browse Source
This commit is contained in:
Dimitri 2022-01-20 12:31:42 +07:00
parent b5a67e5b49
commit d1519c56fd
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contracts/mainnet/connectors/mstable/main.sol
View File

@ -33,6 +33,7 @@ abstract contract mStableResolver is Events, Helpers {
) external returns (string memory _eventName, bytes memory _eventParam) { ) external returns (string memory _eventName, bytes memory _eventParam) {
// //
uint256 mintedAmount = _amount; uint256 mintedAmount = _amount;
address path;
// Check if needs to be minted first // Check if needs to be minted first
if (IMasset(mUsdToken).bAssetIndexes(_token) != 0) { if (IMasset(mUsdToken).bAssetIndexes(_token) != 0) {
@ -44,11 +45,13 @@ abstract contract mStableResolver is Events, Helpers {
_minOut, _minOut,
address(this) address(this)
); );
path = mUsdToken;
} else { } else {
require(mintedAmount >= _minOut, "mintedAmount < _minOut"); require(mintedAmount >= _minOut, "mintedAmount < _minOut");
path = imUsdToken
} }
return _deposit(_token, mintedAmount, imUsdToken); return _deposit(_token, mintedAmount, path);
} }
/** /**
@ -115,7 +118,7 @@ abstract contract mStableResolver is Events, Helpers {
require(amountWithdrawn >= _minOut, "amountWithdrawn < _minOut"); require(amountWithdrawn >= _minOut, "amountWithdrawn < _minOut");
} }
_eventName = "LogWithdraw()"; _eventName = "LogWithdraw(address,uint256,address)";
_eventParam = abi.encode(mUsdToken, amountWithdrawn, imUsdToken); _eventParam = abi.encode(mUsdToken, amountWithdrawn, imUsdToken);
} }
@ -154,7 +157,7 @@ abstract contract mStableResolver is Events, Helpers {
address(this) address(this)
); );
_eventName = "LogRedeem()"; _eventName = "LogWithdraw(address,uint256,address)";
_eventParam = abi.encode(_token, amountRedeemed, _path); _eventParam = abi.encode(_token, amountRedeemed, _path);
} }
@ -178,7 +181,7 @@ abstract contract mStableResolver is Events, Helpers {
uint256 claimedRewardToken = sub(rewardAmountUpdated, rewardAmount); uint256 claimedRewardToken = sub(rewardAmountUpdated, rewardAmount);
_eventName = "LogClaimRewards()"; _eventName = "LogClaimRewards(address,uint256)";
_eventParam = abi.encode(rewardToken, claimedRewardToken); _eventParam = abi.encode(rewardToken, claimedRewardToken);
} }
@ -231,7 +234,7 @@ abstract contract mStableResolver is Events, Helpers {
); );
} }
_eventName = "LogSwap()"; _eventName = "LogSwap(address,address,uint256,uint256)";
_eventParam = abi.encode(_input, _output, _amount, amountSwapped); _eventParam = abi.encode(_input, _output, _amount, amountSwapped);
} }
@ -269,7 +272,7 @@ abstract contract mStableResolver is Events, Helpers {
address(this) address(this)
); );
_eventName = "LogSwap()"; _eventName = "LogSwap(address,address,uint256,uint256)";
_eventParam = abi.encode(_input, _output, _amount, amountSwapped); _eventParam = abi.encode(_input, _output, _amount, amountSwapped);
} }
@ -304,7 +307,7 @@ abstract contract mStableResolver is Events, Helpers {
IBoostedSavingsVault(imUsdVault).stake(credits); IBoostedSavingsVault(imUsdVault).stake(credits);
// 3. Log Events // 3. Log Events
_eventName = "LogDeposit()"; _eventName = "LogDeposit(address,uint256,address)";
_eventParam = abi.encode(_token, _amount, _path); _eventParam = abi.encode(_token, _amount, _path);
} }
@ -359,5 +362,5 @@ abstract contract mStableResolver is Events, Helpers {
} }
contract ConnectV2mStable is mStableResolver { contract ConnectV2mStable is mStableResolver {
string public constant name = "mStable-Mainnet-Connector-v1"; string public constant name = "mStable-v1.0";
} }

19
contracts/polygon/connectors/mstable/main.sol
View File

@ -33,6 +33,7 @@ abstract contract PmStableResolver is Events, Helpers {
) external returns (string memory _eventName, bytes memory _eventParam) { ) external returns (string memory _eventName, bytes memory _eventParam) {
// //
uint256 mintedAmount = _amount; uint256 mintedAmount = _amount;
address path;
// Check if needs to be minted first // Check if needs to be minted first
if (IMasset(mUsdToken).bAssetIndexes(_token) != 0) { if (IMasset(mUsdToken).bAssetIndexes(_token) != 0) {
@ -44,11 +45,13 @@ abstract contract PmStableResolver is Events, Helpers {
_minOut, _minOut,
address(this) address(this)
); );
path = mUsdToken;
} else { } else {
require(mintedAmount >= _minOut, "mintedAmount < _minOut"); require(mintedAmount >= _minOut, "mintedAmount < _minOut");
path = imUsdToken
} }
return _deposit(_token, mintedAmount, imUsdToken); return _deposit(_token, mintedAmount, path);
} }
/** /**
@ -115,7 +118,7 @@ abstract contract PmStableResolver is Events, Helpers {
require(amountWithdrawn >= _minOut, "amountWithdrawn < _minOut"); require(amountWithdrawn >= _minOut, "amountWithdrawn < _minOut");
} }
_eventName = "LogWithdraw()"; _eventName = "LogWithdraw(address,uint256,address)";
_eventParam = abi.encode(mUsdToken, amountWithdrawn, imUsdToken); _eventParam = abi.encode(mUsdToken, amountWithdrawn, imUsdToken);
} }
@ -154,7 +157,7 @@ abstract contract PmStableResolver is Events, Helpers {
address(this) address(this)
); );
_eventName = "LogRedeem()"; _eventName = "LogWithdraw(address,uint256,address)";
_eventParam = abi.encode(_token, amountRedeemed, _path); _eventParam = abi.encode(_token, amountRedeemed, _path);
} }
@ -189,7 +192,7 @@ abstract contract PmStableResolver is Events, Helpers {
platformAmount platformAmount
); );
_eventName = "LogClaimRewards()"; _eventName = "LogClaimRewards(address,uint256,address,uint256)";
_eventParam = abi.encode( _eventParam = abi.encode(
rewardToken, rewardToken,
claimedRewardToken, claimedRewardToken,
@ -247,7 +250,7 @@ abstract contract PmStableResolver is Events, Helpers {
); );
} }
_eventName = "LogSwap()"; _eventName = "LogSwap(address,address,uint256,uint256)";
_eventParam = abi.encode(_input, _output, _amount, amountSwapped); _eventParam = abi.encode(_input, _output, _amount, amountSwapped);
} }
@ -285,7 +288,7 @@ abstract contract PmStableResolver is Events, Helpers {
address(this) address(this)
); );
_eventName = "LogSwap()"; _eventName = "LogSwap(address,address,uint256,uint256)";
_eventParam = abi.encode(_input, _output, _amount, amountSwapped); _eventParam = abi.encode(_input, _output, _amount, amountSwapped);
} }
@ -320,7 +323,7 @@ abstract contract PmStableResolver is Events, Helpers {
IStakingRewardsWithPlatformToken(imUsdVault).stake(credits); IStakingRewardsWithPlatformToken(imUsdVault).stake(credits);
// 3. Log Events // 3. Log Events
_eventName = "LogDeposit()"; _eventName = "LogDeposit(address,uint256,address)";
_eventParam = abi.encode(_token, _amount, _path); _eventParam = abi.encode(_token, _amount, _path);
} }
@ -382,5 +385,5 @@ abstract contract PmStableResolver is Events, Helpers {
} }
contract ConnectV2PmStable is PmStableResolver { contract ConnectV2PmStable is PmStableResolver {
string public constant name = "mStable-Polygon-Connector-v1"; string public constant name = "mStable-Polygon-v1.0";
} }