Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .solhint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"extends": "solhint:recommended",
"rules": {
"reason-string": ["warn", { "maxLength": 50 }],
"compiler-version": ["error", "0.6.10"]
"compiler-version": ["error", "0.6.12"]
}
}
4 changes: 3 additions & 1 deletion contracts/interfaces/IAmmAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IBasicIssuanceModule.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "./ISetToken.sol";

Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IClaimAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/

pragma solidity 0.6.10;
pragma solidity 0.6.12;

/**
* @title IClaimAdapter
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IController.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IController {
function addSet(address _setToken) external;
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IDebtIssuanceModule.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "./ISetToken.sol";

Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IExchangeAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IExchangeAdapter {
function getSpender() external view returns(address);
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IGovernanceAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IIndexExchangeAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IIndexExchangeAdapter {
function getSpender() external view returns(address);
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IIntegrationRegistry.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IIntegrationRegistry {
function addIntegration(address _module, string memory _id, address _wrapper) external;
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IManagerIssuanceHook.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "./ISetToken.sol";

Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IModule.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
6 changes: 4 additions & 2 deletions contracts/interfaces/IModuleIssuanceHook.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

Expand All @@ -31,7 +33,7 @@ interface IModuleIssuanceHook {

function moduleIssueHook(ISetToken _setToken, uint256 _setTokenQuantity) external;
function moduleRedeemHook(ISetToken _setToken, uint256 _setTokenQuantity) external;

function componentIssueHook(
ISetToken _setToken,
uint256 _setTokenQuantity,
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/INAVIssuanceHook.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "./ISetToken.sol";

Expand Down
10 changes: 6 additions & 4 deletions contracts/interfaces/INAVIssuanceModule.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "./ISetToken.sol";

Expand All @@ -26,15 +28,15 @@ interface INAVIssuanceModule {
uint256 _reserveAssetQuantity,
uint256 _minSetTokenReceiveQuantity,
address _to
)
)
external;

function redeem(
ISetToken _setToken,
address _reserveAsset,
uint256 _setTokenQuantity,
uint256 _minReserveReceiveQuantity,
address _to
)
)
external;
}
4 changes: 3 additions & 1 deletion contracts/interfaces/IOracle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IOracleAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IPriceOracle.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

/**
* @title IPriceOracle
Expand Down
14 changes: 8 additions & 6 deletions contracts/interfaces/ISetToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;
pragma experimental "ABIEncoderV2";

import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
Expand Down Expand Up @@ -56,13 +58,13 @@ interface ISetToken is IERC20 {

/**
* A struct that stores a component's cash position details and external positions
* This data structure allows O(1) access to a component's cash position units and
* This data structure allows O(1) access to a component's cash position units and
* virtual units.
*
* @param virtualUnit Virtual value of a component's DEFAULT position. Stored as virtual for efficiency
* updating all units at once via the position multiplier. Virtual units are achieved
* by dividing a "real" value by the "positionMultiplier"
* @param componentIndex
* @param componentIndex
* @param externalPositionModules List of external modules attached to each external position. Each module
* maps to an external position
* @param externalPositions Mapping of module => ExternalPosition struct for a given component
Expand All @@ -87,7 +89,7 @@ interface ISetToken is IERC20 {


/* ============ Functions ============ */

function addComponent(address _component) external;
function removeComponent(address _component) external;
function editDefaultPositionUnit(address _component, int256 _realUnit) external;
Expand Down Expand Up @@ -115,15 +117,15 @@ interface ISetToken is IERC20 {
function manager() external view returns (address);
function moduleStates(address _module) external view returns (ModuleState);
function getModules() external view returns (address[] memory);

function getDefaultPositionRealUnit(address _component) external view returns(int256);
function getExternalPositionRealUnit(address _component, address _positionModule) external view returns(int256);
function getComponents() external view returns(address[] memory);
function getExternalPositionModules(address _component) external view returns(address[] memory);
function getExternalPositionData(address _component, address _positionModule) external view returns(bytes memory);
function isExternalPositionModule(address _component, address _module) external view returns(bool);
function isComponent(address _component) external view returns(bool);

function positionMultiplier() external view returns (int256);
function getPositions() external view returns (Position[] memory);
function getTotalComponentRealUnits(address _component) external view returns(int256);
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/ISetValuer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;

import { ISetToken } from "../interfaces/ISetToken.sol";

Expand Down
8 changes: 5 additions & 3 deletions contracts/interfaces/IStakingAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/

pragma solidity 0.6.10;
pragma solidity 0.6.12;

/**
* @title IStakingAdapter
Expand All @@ -32,14 +34,14 @@ interface IStakingAdapter {
uint256 _notionalAmount
)
external
view
view
returns(address, uint256, bytes memory);

function getUnstakeCallData(
address _stakingContract,
uint256 _notionalAmount
)
external
view
view
returns(address, uint256, bytes memory);
}
4 changes: 3 additions & 1 deletion contracts/interfaces/IStreamingFeeModule.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;
pragma experimental "ABIEncoderV2";

import { ISetToken } from "./ISetToken.sol";
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/IWrapAdapter.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/
pragma solidity 0.6.10;
pragma solidity 0.6.12;


/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/external/IAaveLendingPool.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/

pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IAaveLendingPool {
function core() external view returns(address);
Expand Down
4 changes: 3 additions & 1 deletion contracts/interfaces/external/IAaveLendingPoolCore.sol
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
limitations under the License.

SPDX-License-Identifier: Apache License, Version 2.0

// @unsupported: ovm
*/

pragma solidity 0.6.10;
pragma solidity 0.6.12;

interface IAaveLendingPoolCore {
function getReserveATokenAddress(address _reserve) external view returns (address);
Expand Down
Loading