GenericSchemeMultiCall : Simplification. + Schemeconstraint #795
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| pragma solidity 0.5.17; | ||
| pragma experimental ABIEncoderV2; | ||
|
|
||
| import "./SchemeConstraints.sol"; | ||
|
|
||
|
|
||
| contract DxDaoSchemeConstraints is SchemeConstraints { | ||
| using SafeMath for uint256; | ||
|
|
||
| uint256 public initialTimestamp; | ||
| uint256 public periodSize; | ||
| uint256 public periodLimitWei; | ||
|
|
||
| mapping(address=>uint256) public periodLimitToken; | ||
| mapping (uint256 => mapping(address => uint256)) public periodSpendingToken; | ||
| mapping(uint256=>uint256) public periodSpendingWei; | ||
| mapping(address=>bool) public contractsWhiteListMap; | ||
| bytes4 private constant APPROVE_SIGNATURE = 0x095ea7b3;//approve(address,uint256) | ||
|
|
||
| /* @dev initialize | ||
| * @param _periodSize the time period to limit the tokens and eth spending | ||
| * @param _periodLimitWei the limit of eth which can be sent per period | ||
| * @param _periodLimitTokensAddresses tokens to limit | ||
| * @param _periodLimitTokensAmounts the limit of token which can be sent per period | ||
| * @param _contractsWhiteList the contracts the scheme is allowed to interact with | ||
| */ | ||
| function initialize( | ||
| uint256 _periodSize, | ||
| uint256 _periodLimitWei, | ||
| address[] calldata _periodLimitTokensAddresses, | ||
| uint256[] calldata _periodLimitTokensAmounts, | ||
| address[] calldata _contractsWhiteList | ||
| ) | ||
| external { | ||
| require(initialTimestamp == 0, "cannot initialize twice"); | ||
| require(_periodSize > 0, "preriod size should be greater than 0"); | ||
| require(_periodLimitTokensAddresses.length == _periodLimitTokensAmounts.length, | ||
| "invalid length _periodLimitTokensAddresses"); | ||
| periodSize = _periodSize; | ||
| periodLimitWei = _periodLimitWei; | ||
| // solhint-disable-next-line not-rely-on-time | ||
| initialTimestamp = block.timestamp; | ||
| for (uint i = 0; i < _contractsWhiteList.length; i++) { | ||
| contractsWhiteListMap[_contractsWhiteList[i]] = true; | ||
| } | ||
| for (uint i = 0; i < _periodLimitTokensAmounts.length; i++) { | ||
| periodLimitToken[_periodLimitTokensAddresses[i]] = _periodLimitTokensAmounts[i]; | ||
| } | ||
| contractsWhiteList = _contractsWhiteList; | ||
| } | ||
|
|
||
| /* | ||
| * @dev isAllowedToCall should be called upon a proposal execution. | ||
| * - check that the total spending of tokens within a 'periodSize' does not exceed the periodLimit per token | ||
| * - check that the total sending of eth within a 'periodSize' does not exceed the periodLimit | ||
| * @param _contractsToCall the contracts to be called | ||
| * @param _callsData - The abi encode data for the calls | ||
| * @param _values value(ETH) to transfer with the calls | ||
| * @param _avatar avatar | ||
| * @return bool value true-allowed false not allowed | ||
| */ | ||
| function isAllowedToCall( | ||
| address[] calldata _contractsToCall, | ||
| bytes[] calldata _callsData, | ||
| uint256[] calldata _values, | ||
| Avatar | ||
| ) | ||
| external | ||
| returns(bool) | ||
| { | ||
|
|
||
| uint256 observervationIndex = observationIndex(); | ||
| uint256 totalPeriodSpendingInWei; | ||
| for (uint i = 0; i < _contractsToCall.length; i++) { | ||
| // constraint eth transfer | ||
| totalPeriodSpendingInWei = totalPeriodSpendingInWei.add(_values[i]); | ||
| bytes memory callData = _callsData[i]; | ||
| // constraint approve calls | ||
| if (callData[0] == APPROVE_SIGNATURE[0] && | ||
| callData[1] == APPROVE_SIGNATURE[1] && | ||
| callData[2] == APPROVE_SIGNATURE[2] && | ||
| callData[3] == APPROVE_SIGNATURE[3]) { | ||
| uint256 amount; | ||
| address contractToCall = _contractsToCall[i]; | ||
| // solhint-disable-next-line no-inline-assembly | ||
| assembly { | ||
| amount := mload(add(callData, 68)) | ||
| } | ||
| periodSpendingToken[observervationIndex][contractToCall] = | ||
| periodSpendingToken[observervationIndex][contractToCall].add(amount); | ||
| require( | ||
| periodSpendingToken[observervationIndex][contractToCall] <= periodLimitToken[contractToCall], | ||
| "periodSpendingTokensExceeded"); | ||
| } | ||
|
|
||
| } | ||
| periodSpendingWei[observervationIndex] = | ||
| periodSpendingWei[observervationIndex].add(totalPeriodSpendingInWei); | ||
| require(periodSpendingWei[observervationIndex] <= periodLimitWei, "periodSpendingWeiExceeded"); | ||
| return true; | ||
| } | ||
|
|
||
| /* | ||
| * @dev isAllowedToPropose should be called upon a proposal submition. | ||
| * allow only whitelisted target contracts or 'approve' calls which the 'spender' is whitelisted | ||
| * @param _contractsToCall the contracts to be called | ||
| * @param _callsData - The abi encode data for the calls | ||
| * @param _values value(ETH) to transfer with the calls | ||
| * @param _avatar avatar | ||
| * @return bool value true-allowed false not allowed | ||
| */ | ||
| function isAllowedToPropose( | ||
| address[] calldata _contractsToCall, | ||
| bytes[] calldata _callsData, | ||
| uint256[] calldata, | ||
| Avatar) | ||
| external | ||
| returns(bool) | ||
| { | ||
| for (uint i = 0; i < _contractsToCall.length; i++) { | ||
| if (!contractsWhiteListMap[_contractsToCall[i]]) { | ||
| address spender; | ||
| bytes memory callData = _callsData[i]; | ||
| require( | ||
| callData[0] == APPROVE_SIGNATURE[0] && | ||
| callData[1] == APPROVE_SIGNATURE[1] && | ||
| callData[2] == APPROVE_SIGNATURE[2] && | ||
| callData[3] == APPROVE_SIGNATURE[3], | ||
| "allow only approve call for none whitelistedContracts"); | ||
| //in solidity > 6 this can be replaced by: | ||
| //(spender,) = abi.descode(callData[4:], (address, uint)); | ||
| // see https://github.com/ethereum/solidity/issues/9439 | ||
| // solhint-disable-next-line no-inline-assembly | ||
| assembly { | ||
| spender := mload(add(callData, 36)) | ||
| } | ||
| require(contractsWhiteListMap[spender], "spender contract not whitelisted"); | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| function observationIndex() public view returns (uint256) { | ||
|
There was a problem hiding this comment. @orenyodfat this could become vulnerable to overflows if the period is set to a super low level, I would propose to add a require in the initialize() to set the period to a min limit as of 7days. |
||
| // solhint-disable-next-line not-rely-on-time | ||
| return ((block.timestamp - initialTimestamp) / periodSize); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| pragma solidity 0.5.17; | ||
| pragma experimental ABIEncoderV2; | ||
| import "../controller/Avatar.sol"; | ||
|
|
||
|
|
||
| contract SchemeConstraints { | ||
|
|
||
| address[] public contractsWhiteList; | ||
|
|
||
| /* | ||
| * @dev isAllowedToCall should be called upon a proposal execution. | ||
| * @param _contractsToCall the contracts to be called | ||
| * @param _callsData - The abi encode data for the calls | ||
| * @param _values value(ETH) to transfer with the calls | ||
| * @param _avatar avatar | ||
| * @return bool value true-allowed false not allowed | ||
| */ | ||
| function isAllowedToCall( | ||
| address[] calldata _contractsToCall, | ||
| bytes[] calldata _callsData, | ||
| uint256[] calldata _values, | ||
| Avatar _avatar) | ||
| external returns(bool); | ||
|
|
||
| /* | ||
| * @dev isAllowedToPropose should be called upon a proposal submition. | ||
| * @param _contractsToCall the contracts to be called | ||
| * @param _callsData - The abi encode data for the calls | ||
| * @param _values value(ETH) to transfer with the calls | ||
| * @param _avatar avatar | ||
| * @return bool value true-allowed false not allowed | ||
| */ | ||
| function isAllowedToPropose( | ||
| address[] calldata _contractsToCall, | ||
| bytes[] calldata _callsData, | ||
| uint256[] calldata _values, | ||
| Avatar _avatar) | ||
| external returns(bool); | ||
|
|
||
| function getContractsWhiteList() external view returns(address[] memory) { | ||
| return contractsWhiteList; | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
uint256[] calldata > uint256[] calldata _values?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, because the interface defined that function and there is no use for values at this function