Merge pull request #1618 from morpho-dao/fix/license

morpho-org · Dec 28, 2022 · 84ed4de · 84ed4de
2 parents 6137727 + 6b1a841
commit 84ed4de
Show file tree

Hide file tree

Showing 68 changed files with 77 additions and 76 deletions.
diff --git a/config/eth-mainnet/compound/Config.sol b/config/eth-mainnet/compound/Config.sol
@@ -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";

diff --git a/config/goerli/compound/Config.sol b/config/goerli/compound/Config.sol
@@ -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";

diff --git a/config/ropsten/compound/Config.sol b/config/ropsten/compound/Config.sol
@@ -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";

diff --git a/package.json b/package.json
@@ -2,6 +2,16 @@
   "name": "@morpho-dao/morpho-v1",
   "version": "2.0.0",
   "description": "Core contracts of the Morpho Protocol V1.",
+  "author": "Morpho Labs <security@morpho.xyz>",
+  "license": "AGPL-3.0-only",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/morpho-dao/morpho-v1.git"
+  },
+  "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",
@@ -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",

diff --git a/scripts/compound/Deploy.s.sol b/scripts/compound/Deploy.s.sol
@@ -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";

diff --git a/src/compound/IncentivesVault.sol b/src/compound/IncentivesVault.sol
@@ -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";

diff --git a/src/compound/InterestRatesManager.sol b/src/compound/InterestRatesManager.sol
@@ -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";

diff --git a/src/compound/MatchingEngine.sol b/src/compound/MatchingEngine.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./MorphoUtils.sol";

diff --git a/src/compound/Morpho.sol b/src/compound/Morpho.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./MorphoGovernance.sol";

diff --git a/src/compound/MorphoGovernance.sol b/src/compound/MorphoGovernance.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./MorphoUtils.sol";

diff --git a/src/compound/MorphoStorage.sol b/src/compound/MorphoStorage.sol
@@ -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";

diff --git a/src/compound/MorphoUtils.sol b/src/compound/MorphoUtils.sol
@@ -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";

diff --git a/src/compound/PositionsManager.sol b/src/compound/PositionsManager.sol
@@ -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";

diff --git a/src/compound/RewardsManager.sol b/src/compound/RewardsManager.sol
@@ -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";

diff --git a/src/compound/interfaces/IIncentivesVault.sol b/src/compound/interfaces/IIncentivesVault.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 import "./IOracle.sol";

diff --git a/src/compound/interfaces/IInterestRatesManager.sol b/src/compound/interfaces/IInterestRatesManager.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IInterestRatesManager {

diff --git a/src/compound/interfaces/IMorpho.sol b/src/compound/interfaces/IMorpho.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 import "./IInterestRatesManager.sol";

diff --git a/src/compound/interfaces/IOracle.sol b/src/compound/interfaces/IOracle.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IOracle {

diff --git a/src/compound/interfaces/IPositionsManager.sol b/src/compound/interfaces/IPositionsManager.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IPositionsManager {

diff --git a/src/compound/interfaces/IRewardsManager.sol b/src/compound/interfaces/IRewardsManager.sol
@@ -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";

diff --git a/src/compound/interfaces/IWETH.sol b/src/compound/interfaces/IWETH.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IWETH {

diff --git a/src/compound/interfaces/compound/ICompound.sol b/src/compound/interfaces/compound/ICompound.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface ICEth {

diff --git a/src/compound/lens/IndexesLens.sol b/src/compound/lens/IndexesLens.sol
@@ -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";

diff --git a/src/compound/lens/Lens.sol b/src/compound/lens/Lens.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./RewardsLens.sol";

diff --git a/src/compound/lens/LensStorage.sol b/src/compound/lens/LensStorage.sol
@@ -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";

diff --git a/src/compound/lens/MarketsLens.sol b/src/compound/lens/MarketsLens.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./RatesLens.sol";

diff --git a/src/compound/lens/RatesLens.sol b/src/compound/lens/RatesLens.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./UsersLens.sol";

diff --git a/src/compound/lens/RewardsLens.sol b/src/compound/lens/RewardsLens.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./MarketsLens.sol";

diff --git a/src/compound/lens/UsersLens.sol b/src/compound/lens/UsersLens.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./IndexesLens.sol";

diff --git a/src/compound/lens/interfaces/ILens.sol b/src/compound/lens/interfaces/ILens.sol
@@ -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";

diff --git a/src/compound/libraries/CompoundMath.sol b/src/compound/libraries/CompoundMath.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 /// @title CompoundMath.

diff --git a/src/compound/libraries/InterestRatesModel.sol b/src/compound/libraries/InterestRatesModel.sol
@@ -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";

diff --git a/src/compound/libraries/Types.sol b/src/compound/libraries/Types.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 /// @title Types.

diff --git a/test/compound/TestBorrow.t.sol b/test/compound/TestBorrow.t.sol
@@ -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";

diff --git a/test/compound/TestEth.t.sol b/test/compound/TestEth.t.sol
@@ -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";

diff --git a/test/compound/TestFees.t.sol b/test/compound/TestFees.t.sol
@@ -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";

diff --git a/test/compound/TestGovernance.t.sol b/test/compound/TestGovernance.t.sol
@@ -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";

diff --git a/test/compound/TestIncentivesVault.t.sol b/test/compound/TestIncentivesVault.t.sol
@@ -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";

diff --git a/test/compound/TestInterestRates.t.sol b/test/compound/TestInterestRates.t.sol
@@ -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";

diff --git a/test/compound/TestLens.t.sol b/test/compound/TestLens.t.sol
@@ -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";

diff --git a/test/compound/TestLiquidate.t.sol b/test/compound/TestLiquidate.t.sol
@@ -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";

diff --git a/test/compound/TestMarketMember.t.sol b/test/compound/TestMarketMember.t.sol
@@ -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";

diff --git a/test/compound/TestMarketStrategy.t.sol b/test/compound/TestMarketStrategy.t.sol
@@ -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";

diff --git a/test/compound/TestMorphoGetters.t.sol b/test/compound/TestMorphoGetters.t.sol
@@ -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";

diff --git a/test/compound/TestMorphoUtils.t.sol b/test/compound/TestMorphoUtils.t.sol
@@ -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";

diff --git a/test/compound/TestP2PDisable.t.sol b/test/compound/TestP2PDisable.t.sol
@@ -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";

diff --git a/test/compound/TestPausableMarket.t.sol b/test/compound/TestPausableMarket.t.sol
@@ -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";

diff --git a/test/compound/TestRatesLens.t.sol b/test/compound/TestRatesLens.t.sol
@@ -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";

diff --git a/test/compound/TestRepay.t.sol b/test/compound/TestRepay.t.sol
@@ -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";

diff --git a/test/compound/TestRewards.t.sol b/test/compound/TestRewards.t.sol
@@ -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";

diff --git a/test/compound/TestRoundings.t.sol b/test/compound/TestRoundings.t.sol
@@ -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";

diff --git a/test/compound/TestSupply.t.sol b/test/compound/TestSupply.t.sol
@@ -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";

diff --git a/test/compound/TestUpgradeable.t.sol b/test/compound/TestUpgradeable.t.sol
@@ -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";

diff --git a/test/compound/TestWithdraw.t.sol b/test/compound/TestWithdraw.t.sol
@@ -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";

diff --git a/test/compound/helpers/Attacker.sol b/test/compound/helpers/Attacker.sol
@@ -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";

diff --git a/test/compound/helpers/DumbOracle.sol b/test/compound/helpers/DumbOracle.sol
@@ -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";

diff --git a/test/compound/helpers/IncentivesVault.sol b/test/compound/helpers/IncentivesVault.sol
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "./DumbOracle.sol";

diff --git a/test/compound/helpers/SimplePriceOracle.sol b/test/compound/helpers/SimplePriceOracle.sol
@@ -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";

diff --git a/test/compound/helpers/User.sol b/test/compound/helpers/User.sol
@@ -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";

diff --git a/test/compound/setup/TestSetup.sol b/test/compound/setup/TestSetup.sol
@@ -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";

diff --git a/test/compound/setup/Utils.sol b/test/compound/setup/Utils.sol
@@ -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";

diff --git a/test/prod/compound/TestDeltas.t.sol b/test/prod/compound/TestDeltas.t.sol
@@ -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";