From a51ad6fd4569a697135c9de9527497c32fe526f8 Mon Sep 17 00:00:00 2001 From: Dimitri Golecko Date: Tue, 1 Feb 2022 16:41:20 +0100 Subject: [PATCH] chore: add payable --- contracts/mainnet/connectors/mstable/main.sol | 37 ++++++++++++++++--- contracts/polygon/connectors/mstable/main.sol | 37 ++++++++++++++++--- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/contracts/mainnet/connectors/mstable/main.sol b/contracts/mainnet/connectors/mstable/main.sol index 30107346..fcbbc690 100644 --- a/contracts/mainnet/connectors/mstable/main.sol +++ b/contracts/mainnet/connectors/mstable/main.sol @@ -36,7 +36,11 @@ abstract contract mStableResolver is Events, Helpers { bool _stake, uint256 _setId, uint256 _getId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1) ? TokenInterface(_token).balanceOf(address(this)) @@ -92,7 +96,11 @@ abstract contract mStableResolver is Events, Helpers { bool _stake, uint256 _setId, uint256 _getId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { require(_path != address(0), "Path must be set"); require( IMasset(mUsdToken).bAssetIndexes(_token) == 0, @@ -142,7 +150,11 @@ abstract contract mStableResolver is Events, Helpers { bool _unstake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 credits = getUint(_getId, _credits); uint256 amountWithdrawn = _withdraw(credits, _unstake); @@ -190,7 +202,11 @@ abstract contract mStableResolver is Events, Helpers { bool _unstake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { require(_path != address(0), "Path must be set"); require( IMasset(mUsdToken).bAssetIndexes(_token) == 0, @@ -227,6 +243,7 @@ abstract contract mStableResolver is Events, Helpers { function claimRewards(uint256 _getId, uint256 _setId) external + payable returns (string memory _eventName, bytes memory _eventParam) { address rewardToken = _getRewardTokens(); @@ -264,7 +281,11 @@ abstract contract mStableResolver is Events, Helpers { uint256 _minOut, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1) ? TokenInterface(_input).balanceOf(address(this)) @@ -327,7 +348,11 @@ abstract contract mStableResolver is Events, Helpers { address _path, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amountSwapped; uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1) diff --git a/contracts/polygon/connectors/mstable/main.sol b/contracts/polygon/connectors/mstable/main.sol index 2f116322..d2939fb8 100644 --- a/contracts/polygon/connectors/mstable/main.sol +++ b/contracts/polygon/connectors/mstable/main.sol @@ -35,7 +35,11 @@ abstract contract PmStableResolver is Events, Helpers { bool _stake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1) ? TokenInterface(_token).balanceOf(address(this)) @@ -92,7 +96,11 @@ abstract contract PmStableResolver is Events, Helpers { bool _stake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { require(_path != address(0), "Path must be set"); require( IMasset(mUsdToken).bAssetIndexes(_token) == 0, @@ -142,7 +150,11 @@ abstract contract PmStableResolver is Events, Helpers { bool _unstake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 credits = getUint(_getId, _credits); uint256 amountWithdrawn = _withdraw(credits, _unstake); @@ -190,7 +202,11 @@ abstract contract PmStableResolver is Events, Helpers { bool _unstake, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { require(_path != address(0), "Path must be set"); require( IMasset(mUsdToken).bAssetIndexes(_token) == 0, @@ -225,6 +241,7 @@ abstract contract PmStableResolver is Events, Helpers { function claimRewards(uint256 _getId, uint256 _setId) external + payable returns (string memory _eventName, bytes memory _eventParam) { (address rewardToken, address platformToken) = _getRewardTokens(); @@ -277,7 +294,11 @@ abstract contract PmStableResolver is Events, Helpers { uint256 _minOut, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1) ? TokenInterface(_input).balanceOf(address(this)) @@ -342,7 +363,11 @@ abstract contract PmStableResolver is Events, Helpers { address _path, uint256 _getId, uint256 _setId - ) external returns (string memory _eventName, bytes memory _eventParam) { + ) + external + payable + returns (string memory _eventName, bytes memory _eventParam) + { uint256 amountSwapped; uint256 amount = getUint(_getId, _amount); amount = amount == uint256(-1)