Instadapp/dsa-connectors-old
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors-old.git synced 2024-07-29 22:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lecky Lao 2020-08-20 15:51:05 +10:00
commit dbc3698a86
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/connectors/1inch.sol
View File

@ -74,7 +74,7 @@ contract OneHelpers is Stores, DSMath {
/**
* @dev Return 1proto Address
*/
function getOneProtoAddress() internal view returns (address payable) {
function getOneProtoAddress() internal virtual view returns (address payable) {
return payable(OneProtoMappingInterface(getOneProtoMappingAddress()).oneProtoAddress());
}
@ -642,4 +642,4 @@ contract OneInch is OneProto {
contract ConnectOne is OneInch {
string public name = "1inch-1proto-v1";
}
}

1
contracts/mapping/staking.sol
View File

@ -83,6 +83,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");

2
contracts/tests/mockOneProto.sol
View File

@ -1,7 +1,7 @@
pragma solidity ^0.6.0;
pragma experimental ABIEncoderV2;
import { ConnectOne } from "../connectors/1proto.sol";
import { ConnectOne } from "../connectors/1inch.sol";
contract MockConnectOne is ConnectOne {
address public oneProtoAddr;