From f00e467f6c0d54694a4b040cb5cd26432a9384f1 Mon Sep 17 00:00:00 2001 From: Richard Liang Date: Tue, 10 Mar 2020 16:09:27 -0700 Subject: [PATCH 1/3] Add interface for protocol viewer --- .../managers/interfaces/IAssetPairManager.sol | 25 +++++++++++++++++++ .../interfaces/IMACOStrategyManagerV2.sol | 25 +++++++++++++++++++ package.json | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 contracts/managers/interfaces/IAssetPairManager.sol create mode 100644 contracts/managers/interfaces/IMACOStrategyManagerV2.sol diff --git a/contracts/managers/interfaces/IAssetPairManager.sol b/contracts/managers/interfaces/IAssetPairManager.sol new file mode 100644 index 0000000..6f51139 --- /dev/null +++ b/contracts/managers/interfaces/IAssetPairManager.sol @@ -0,0 +1,25 @@ +/* + Copyright 2020 Set Labs Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +pragma solidity 0.5.7; +pragma experimental "ABIEncoderV2"; + + +contract AssetPairManager { + function signalConfirmationMinTime() external view returns (uint256); + function signalConfirmationMaxTime() external view returns (uint256); +} + diff --git a/contracts/managers/interfaces/IMACOStrategyManagerV2.sol b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol new file mode 100644 index 0000000..e460919 --- /dev/null +++ b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol @@ -0,0 +1,25 @@ +/* + Copyright 2020 Set Labs Inc. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +pragma solidity 0.5.7; +pragma experimental "ABIEncoderV2"; + + +contract MACOStrategyManagerV2 { + function crossoverConfirmationMinTime() external view returns (uint256); + function crossoverConfirmationMaxTime() external view returns (uint256); +} + diff --git a/package.json b/package.json index 29c7db3..d1b12a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "set-protocol-strategies", - "version": "1.1.27", + "version": "1.1.28", "main": "dist/artifacts/index.js", "typings": "dist/typings/artifacts/index.d.ts", "files": [ From 3346bdf6bdb6c0d2a4ae7ed4ed58357afd957f9d Mon Sep 17 00:00:00 2001 From: Richard Liang Date: Tue, 10 Mar 2020 16:11:15 -0700 Subject: [PATCH 2/3] Fix javadoc --- contracts/managers/interfaces/IAssetPairManager.sol | 9 +++++++-- contracts/managers/interfaces/IMACOStrategyManagerV2.sol | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/contracts/managers/interfaces/IAssetPairManager.sol b/contracts/managers/interfaces/IAssetPairManager.sol index 6f51139..e5868aa 100644 --- a/contracts/managers/interfaces/IAssetPairManager.sol +++ b/contracts/managers/interfaces/IAssetPairManager.sol @@ -17,8 +17,13 @@ pragma solidity 0.5.7; pragma experimental "ABIEncoderV2"; - -contract AssetPairManager { +/** + * @title IAssetPairManager + * @author Set Protocol + * + * Interface for interacting with AssetPairManager contracts + */ +interface IAssetPairManager { function signalConfirmationMinTime() external view returns (uint256); function signalConfirmationMaxTime() external view returns (uint256); } diff --git a/contracts/managers/interfaces/IMACOStrategyManagerV2.sol b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol index e460919..6d743d8 100644 --- a/contracts/managers/interfaces/IMACOStrategyManagerV2.sol +++ b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol @@ -17,8 +17,13 @@ pragma solidity 0.5.7; pragma experimental "ABIEncoderV2"; - -contract MACOStrategyManagerV2 { +/** + * @title IMACOStrategyManagerV2 + * @author Set Protocol + * + * Interface for interacting with MACOStrategyManagerV2 contracts + */ +interface IMACOStrategyManagerV2 { function crossoverConfirmationMinTime() external view returns (uint256); function crossoverConfirmationMaxTime() external view returns (uint256); } From 13e13af5d8dc42809ce6eb1dd3827f6cdc0a6c6d Mon Sep 17 00:00:00 2001 From: Richard Liang Date: Tue, 10 Mar 2020 16:36:39 -0700 Subject: [PATCH 3/3] Add function signature --- contracts/managers/interfaces/IAssetPairManager.sol | 1 + contracts/managers/interfaces/IMACOStrategyManagerV2.sol | 1 + 2 files changed, 2 insertions(+) diff --git a/contracts/managers/interfaces/IAssetPairManager.sol b/contracts/managers/interfaces/IAssetPairManager.sol index e5868aa..233208a 100644 --- a/contracts/managers/interfaces/IAssetPairManager.sol +++ b/contracts/managers/interfaces/IAssetPairManager.sol @@ -26,5 +26,6 @@ pragma experimental "ABIEncoderV2"; interface IAssetPairManager { function signalConfirmationMinTime() external view returns (uint256); function signalConfirmationMaxTime() external view returns (uint256); + function recentInitialProposeTimestamp() external view returns (uint256); } diff --git a/contracts/managers/interfaces/IMACOStrategyManagerV2.sol b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol index 6d743d8..3fb1665 100644 --- a/contracts/managers/interfaces/IMACOStrategyManagerV2.sol +++ b/contracts/managers/interfaces/IMACOStrategyManagerV2.sol @@ -26,5 +26,6 @@ pragma experimental "ABIEncoderV2"; interface IMACOStrategyManagerV2 { function crossoverConfirmationMinTime() external view returns (uint256); function crossoverConfirmationMaxTime() external view returns (uint256); + function lastCrossoverConfirmationTimestamp() external view returns (uint256); }