Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add license #5

Merged
merged 4 commits into from
Jan 23, 2024
Merged

chore: add license #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dabfe9f
chore: add license
mrice32 Jan 23, 2024
bca5928
WIP
mrice32 Jan 23, 2024
101b3f8
WIP
mrice32 Jan 23, 2024
7616432
WIP
mrice32 Jan 23, 2024
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
715 changes: 70 additions & 645 deletions LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 5 additions & 7 deletions scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "oval-contract-scripts",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we should make this change. this is a sub-package within scripts that is just used for simulation. its not for the actual contracts.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

"name": "oval-contracts",
"version": "1.0.0",
"description": "Oval simulation scripts",
"description": "Oval Contracts",
"main": "dist/index.js",
"repository": "git@github.com:UMAprotocol/oval-contracts.git",
"author": "UMA team",
"license": "AGPL-3.0-only",
"author": "Risk Labs",
"license": "BUSL-1.1",
"private": true,
"scripts": {
"generate-contract-types": "rm -rf contract-types && typechain --target ethers-v5 --out-dir contract-types $(find ../out -name '*.json' ! -name 'Common.json')",
Expand All @@ -17,9 +17,7 @@
"@typechain/ethers-v5": "^11.1.2",
"@types/node": "^20.8.6",
"typechain": "^8.3.2",
"typescript": "^5.2.2"
},
"dependencies": {
"typescript": "^5.2.2",
"axios": "^1.5.1",
"dotenv": "^16.3.1",
"ethers": "^5.7.2"
Expand Down
2 changes: 1 addition & 1 deletion src/DiamondRootOval.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {IBaseOracleAdapter} from "./interfaces/IBaseOracleAdapter.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/Oval.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/destination-adapters/BaseDestinationAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DiamondRootOval} from "../../DiamondRootOval.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/destination-adapters/ChainlinkDestinationAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DecimalLib} from "../lib/DecimalLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/destination-adapters/UniswapAnchoredViewDestinationAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Ownable} from "openzeppelin-contracts/contracts/access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/lib/DecimalLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Math} from "openzeppelin-contracts/contracts/utils/math/Math.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/source-adapters/ChainlinkSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DecimalLib} from "../lib/DecimalLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/source-adapters/SnapshotSource.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DiamondRootOval} from "../../DiamondRootOval.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/adapters/source-adapters/UniswapAnchoredViewSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DecimalLib} from "../lib/DecimalLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/BaseController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Ownable} from "openzeppelin-contracts/contracts/access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/controllers/ImmutableController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Oval} from "../Oval.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IBaseController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IBaseController {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IBaseOracleAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IBaseOracleAdapter {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/IOval.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IOval {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/chainlink/IAccessControlledAggregatorV3.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {IAggregatorV3} from "./IAggregatorV3.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/chainlink/IAggregatorV3.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IAggregatorV3 {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/chainlink/IAggregatorV3Source.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IAggregatorV3Source {
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/compound/IValidatorProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IValidatorProxy {
Expand Down
2 changes: 1 addition & 1 deletion test/Common.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Test} from "forge-std/Test.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/aave/AaveV2.Liquidation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/aave/AaveV3.Liquidation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/adapters/ChainlinkSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/adapters/UniswapAnchoredViewSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/compound/CompoundV2.Liquidation.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/fork/interfaces/aave/IAaveOracle.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity ^0.8.0;

interface IAaveOracle {
Expand Down
2 changes: 1 addition & 1 deletion test/fork/interfaces/aave/ILendingPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity ^0.8.0;

interface ILendingPool {
Expand Down
2 changes: 1 addition & 1 deletion test/fork/interfaces/compoundV2/IComptroller.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IComptroller {
Expand Down
2 changes: 1 addition & 1 deletion test/fork/interfaces/compoundV2/IValidatorProxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

interface IValidatorProxyTest {
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/MockChainlinkV3Aggregator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {IAggregatorV3} from "../../src/interfaces/chainlink/IAggregatorV3.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/MockSnapshotSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {SnapshotSource} from "../../src/adapters/source-adapters/SnapshotSource.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/mocks/MockSourceAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {DiamondRootOval} from "../../src/DiamondRootOval.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/BaseController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/DecimalLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/ImmutableController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Oval.ChainlinkDestinationAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {Oval} from "../../src/Oval.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Oval.UniswapAnchoredViewDestinationAdapter.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {BaseDestinationAdapter} from "../../src/adapters/destination-adapters/BaseDestinationAdapter.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/Oval.UnlockLatestValue.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../Common.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/unit/SnapshotSource.SnapshotData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-only
// SPDX-License-Identifier: BUSL-1.1
pragma solidity 0.8.17;

import {CommonTest} from "../Common.sol";
Expand Down
Loading