Merge branch 'master' into curve-vesting-connector-feature

This commit is contained in:
Thrilok kumar 2020-08-23 03:07:06 +05:30 committed by GitHub
commit 9ca73dfe77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions

View File

@ -74,7 +74,7 @@ contract OneHelpers is Stores, DSMath {
/**
* @dev Return 1proto Address
*/
function getOneProtoAddress() virtual internal view returns (address payable) {
function getOneProtoAddress() internal virtual view returns (address payable) {
return payable(OneProtoMappingInterface(getOneProtoMappingAddress()).oneProtoAddress());
}

View File

@ -82,6 +82,7 @@ contract Helpers is BytesHelper {
) public isChief {
require(stakingAddress != address(0), "stakingAddress-not-vaild");
require(stakingToken != address(0), "stakingToken-not-vaild");
require(rewardToken != address(0), "rewardToken-not-vaild");
require(bytes(stakingName).length <= 32, "Length-exceeds");
bytes32 stakeType = stringToBytes32(stakingName);
require(stakingMapping[stakeType].stakingPool == address(0), "StakingPool-already-added");