SetProtocol · cgewecke · Apr 28, 2021 · Apr 28, 2021 · Apr 29, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -31,106 +31,27 @@ jobs:
           key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
           paths:
             - ~/set-protocol-v2
-  test:
+
+  test_ovm:
     docker:
       - image: circleci/node:10.16.0
     working_directory: ~/set-protocol-v2
-    parallelism: 3
     steps:
       - setup_remote_docker:
           docker_layer_caching: false
-      - run:
-          name: Fetch solc version
-          command: docker pull ethereum/solc:0.6.10
       - restore_cache:
           key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Set Up Environment Variables
           command: cp .env.default .env
-      - run:
-          name: Test RPC
-          command: yarn chain
-          background: true
-      - run:
-          name: Hardhat Test
-          command: |
-            TEST_FILES="$(circleci tests glob "./test/**/*.spec.ts" | circleci tests split --split-by=timings)"
-            yarn test ${TEST_FILES}
 
-  coverage:
-    docker:
-      - image: circleci/node:10.11.0
-    working_directory: ~/set-protocol-v2
-    # When changing the parallelism value, you also
-    # need to update the `persist_to_workspace` paths
-    # in this job (below) as well as the list of files passed
-    # to istanbul-combine in the `report_coverage` job
-    parallelism: 5
-    steps:
-      - setup_remote_docker:
-          docker_layer_caching: false
-      - run:
-          name: Fetch solc version
-          command: docker pull ethereum/solc:0.6.10
-      - restore_cache:
-          key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Set Up Environment Variables
-          command: cp .env.default .env
-      - run:
-          name: Create shared coverage outputs folder
-          command: mkdir -p /tmp/coverage
-      - run:
-          name: Coverage
-          command: |
-            TEST_FILES="{$(circleci tests glob "./test/**/*.spec.ts" | \
-              circleci tests split --split-by=timings | xargs | sed -e 's/ /,/g')}"
-            yarn coverage -- --testfiles "$TEST_FILES"
-      - run:
-          name: Save coverage
-          command: |
-            cp coverage.json /tmp/coverage/cov_$CIRCLE_NODE_INDEX.json
-            chmod -R 777 /tmp/coverage/cov_$CIRCLE_NODE_INDEX.json
-      - persist_to_workspace:
-          root: /tmp/coverage
-          paths:
-            - cov_0.json
-            - cov_1.json
-            - cov_2.json
-            - cov_3.json
-            - cov_4.json
-
-  report_coverage:
-    docker:
-      - image: circleci/node:10.11.0
-    working_directory: ~/set-protocol-v2
-    steps:
-      - attach_workspace:
-          at: /tmp/coverage
-      - restore_cache:
-          key: compiled-env-{{ .Environment.CIRCLE_SHA1 }}
-      - run:
-          name: Combine coverage reports
-          command: |
-            mkdir -p reports
-            cp -R /tmp/coverage/* .
-            npx istanbul-combine-updated -r lcov cov_0.json cov_1.json cov_2.json cov_3.json cov_4.json
-      - run:
-          name: Upload coverage
-          command: |
-            cat coverage/lcov.info | node_modules/.bin/coveralls
+      # TODO....
 
 workflows:
   version: 2
   build-and-test:
     jobs:
       - checkout_and_compile
-      - test:
-          requires:
-            - checkout_and_compile
-      - coverage:
-          requires:
-            - checkout_and_compile
-      - report_coverage:
+      - test_ovm:
           requires:
-            - coverage
+            - checkout_and_compile
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 .DS_Store
 /artifacts
+/artifacts-ovm
 /build
 /cache
+/cache-ovm
 /dist
 /etherscan
 /flatten

diff --git a/contracts/interfaces/IBasicIssuanceModule.sol b/contracts/interfaces/IBasicIssuanceModule.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IController.sol b/contracts/interfaces/IController.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IExchangeAdapter.sol b/contracts/interfaces/IExchangeAdapter.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IIndexExchangeAdapter.sol b/contracts/interfaces/IIndexExchangeAdapter.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IIntegrationRegistry.sol b/contracts/interfaces/IIntegrationRegistry.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IManagerIssuanceHook.sol b/contracts/interfaces/IManagerIssuanceHook.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IModule.sol b/contracts/interfaces/IModule.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IModuleIssuanceHook.sol b/contracts/interfaces/IModuleIssuanceHook.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IOracle.sol b/contracts/interfaces/IOracle.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IOracleAdapter.sol b/contracts/interfaces/IOracleAdapter.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IPriceOracle.sol b/contracts/interfaces/IPriceOracle.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/ISetToken.sol b/contracts/interfaces/ISetToken.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 pragma experimental "ABIEncoderV2";

diff --git a/contracts/interfaces/ISetValuer.sol b/contracts/interfaces/ISetValuer.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 

diff --git a/contracts/interfaces/IStreamingFeeModule.sol b/contracts/interfaces/IStreamingFeeModule.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 pragma solidity 0.6.12;
 pragma experimental "ABIEncoderV2";

diff --git a/contracts/interfaces/external/ICErc20.sol b/contracts/interfaces/external/ICErc20.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/interfaces/external/ISynth.sol b/contracts/interfaces/external/ISynth.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/interfaces/external/ISynthetixExchanger.sol b/contracts/interfaces/external/ISynthetixExchanger.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/interfaces/external/IUniswapV2Pair.sol b/contracts/interfaces/external/IUniswapV2Pair.sol
@@ -10,8 +10,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/interfaces/external/IUniswapV2Router.sol b/contracts/interfaces/external/IUniswapV2Router.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/interfaces/external/IWETH.sol b/contracts/interfaces/external/IWETH.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/lib/AddressArrayUtils.sol b/contracts/lib/AddressArrayUtils.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/lib/ExplicitERC20.sol b/contracts/lib/ExplicitERC20.sol
@@ -14,14 +14,12 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;
 
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
+import { SafeERC20 } from "../../external/contracts/openzeppelin/token/ERC20/SafeERC20.sol";
 import { SafeMath } from "@openzeppelin/contracts/math/SafeMath.sol";
 
 /**

diff --git a/contracts/lib/PreciseUnitMath.sol b/contracts/lib/PreciseUnitMath.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/lib/Uint256ArrayUtils.sol b/contracts/lib/Uint256ArrayUtils.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/mocks/OracleMock.sol b/contracts/mocks/OracleMock.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/mocks/StandardTokenMock.sol b/contracts/mocks/StandardTokenMock.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/protocol/Controller.sol b/contracts/protocol/Controller.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/protocol/IntegrationRegistry.sol b/contracts/protocol/IntegrationRegistry.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;

diff --git a/contracts/protocol/PriceOracle.sol b/contracts/protocol/PriceOracle.sol
@@ -14,8 +14,6 @@
     limitations under the License.
 
     SPDX-License-Identifier: Apache License, Version 2.0
-
-    // @unsupported: ovm
 */
 
 pragma solidity 0.6.12;