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.

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

Set valid SPDX license identifier #1618

Merged
merged 2 commits into from
Dec 28, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
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 config/eth-mainnet/compound/Config.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.0;

import "src/compound/interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion config/goerli/compound/Config.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.0;

import "src/compound/libraries/Types.sol";
Expand Down
2 changes: 1 addition & 1 deletion config/ropsten/compound/Config.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.8.0;

import "src/compound/libraries/Types.sol";
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
"name": "@morpho-dao/morpho-v1",
"version": "2.0.0",
"description": "Core contracts of the Morpho Protocol V1.",
"author": "Morpho Labs",
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
"repository": {
"type": "git",
"url": "git+https://github.com/morpho-dao/morpho-v1.git"
},
"license": "GPL-3.0-only",
Rubilmax marked this conversation as resolved.
Show resolved Hide resolved
"bugs": {
"url": "https://github.com/morpho-dao/morpho-v1/issues"
},
"homepage": "https://github.com/morpho-dao/morpho-v1#readme",
"scripts": {
"test": "hardhat test test-ts/*.spec.ts",
"test:upgrade:stEth": "BLOCK_NUMBER=15580517 hardhat test test-ts/upgrades/stEth.spec.ts",
Expand All @@ -13,15 +23,6 @@
"format:sol": "prettier --write './**/*.sol'",
"postinstall": "husky install"
},
"repository": {
"type": "git",
"url": "git+https://github.com/morpho-dao/morpho-v1.git"
},
"license": "ISC",
"bugs": {
"url": "https://github.com/morpho-dao/morpho-v1/issues"
},
"homepage": "https://github.com/morpho-dao/morpho-v1#readme",
"devDependencies": {
"@morpho-labs/ethers-multicall": "^1.3.1",
"@morpho-labs/morpho-ethers-contract": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion scripts/compound/Deploy.s.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "src/compound/interfaces/IRewardsManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/IncentivesVault.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./interfaces/IIncentivesVault.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/InterestRatesManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./interfaces/IInterestRatesManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/MatchingEngine.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./MorphoUtils.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/Morpho.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./MorphoGovernance.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/MorphoGovernance.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./MorphoUtils.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/MorphoStorage.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/MorphoUtils.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/PositionsManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./interfaces/IPositionsManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/RewardsManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./interfaces/IRewardsManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IIncentivesVault.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

import "./IOracle.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IInterestRatesManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

interface IInterestRatesManager {
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IMorpho.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

import "./IInterestRatesManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IOracle.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

interface IOracle {
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IPositionsManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

interface IPositionsManager {
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IRewardsManager.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

import "./compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/IWETH.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

interface IWETH {
Expand Down
2 changes: 1 addition & 1 deletion src/compound/interfaces/compound/ICompound.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

interface ICEth {
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/IndexesLens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "../libraries/InterestRatesModel.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/Lens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./RewardsLens.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/LensStorage.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "../interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/MarketsLens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./RatesLens.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/RatesLens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./UsersLens.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/RewardsLens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./MarketsLens.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/UsersLens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity 0.8.13;

import "./IndexesLens.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/lens/interfaces/ILens.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity >=0.5.0;

import "../../interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/libraries/CompoundMath.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

/// @title CompoundMath.
Expand Down
2 changes: 1 addition & 1 deletion src/compound/libraries/InterestRatesModel.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "@morpho-dao/morpho-utils/math/PercentageMath.sol";
Expand Down
2 changes: 1 addition & 1 deletion src/compound/libraries/Types.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

/// @title Types.
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestBorrow.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestEth.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestFees.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestGovernance.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestIncentivesVault.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestInterestRates.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/InterestRatesManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestLens.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestLiquidate.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestMarketMember.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestMarketStrategy.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestMorphoGetters.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestMorphoUtils.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestP2PDisable.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestPausableMarket.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestRatesLens.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestRepay.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestRewards.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestRoundings.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestSupply.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestUpgradeable.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/TestWithdraw.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import {Attacker} from "./helpers/Attacker.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/helpers/Attacker.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/helpers/DumbOracle.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/interfaces/IOracle.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/helpers/IncentivesVault.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./DumbOracle.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/helpers/SimplePriceOracle.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/interfaces/compound/ICompound.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/helpers/User.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/interfaces/IRewardsManager.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/setup/TestSetup.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/interfaces/IMorpho.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/compound/setup/Utils.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "src/compound/libraries/CompoundMath.sol";
Expand Down
2 changes: 1 addition & 1 deletion test/prod/compound/TestDeltas.t.sol
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-License-Identifier: GNU AGPLv3
// SPDX-License-Identifier: AGPL-3.0-only
pragma solidity ^0.8.0;

import "./setup/TestSetup.sol";
Expand Down
Loading