Sync main into upgrade-morpho-1

Makefile

@@ -24,6 +24,7 @@ install:
 	git submodule update --init --recursive
 
 	chmod +x ./scripts/**/*.sh
+	chmod +x ./export_env.sh
 
 deploy:
 	@echo Deploying Morpho-${PROTOCOL}-${NETWORK}
@@ -69,7 +70,7 @@ test-upgrade:
 	@FOUNDRY_MATCH_CONTRACT=TestUpgrade FOUNDRY_PROFILE=production make test
 
 test-common:
-	@FOUNDRY_TEST=test/common/ FOUNDRY_PROFILE=common make test
+	@FOUNDRY_TEST=test/common/ make test
 
 test-upgrade-%:
 	@FOUNDRY_MATCH_TEST=$* make test-upgrade

README.md

@@ -147,6 +147,13 @@ make test-testBorrow1 PROTOCOL=aave-v2
 
 For the other commands, check the [Makefile](./Makefile).
 
+If you want to call a custom forge command, and not have to edit the `Makefile`, you can _source_ the `export_env.sh` script by calling `. ./export_env.sh`.
+
+:warning: The `export_env.sh` script exports environment variables in the current shell, meaning that subsequent calls to `make` or `forge` will use those variables. Variables defined in the `.env.local` file will still override those if you run `make` later. If you don't want to change variables in the current shell, you can always create a new shell in one of the following ways:
+
+- use `( . ./export_env.sh && forge test )` if the command you want to run is `forge test`
+- use `bash` and then `. ./export_env.sh` followed by your commands and then `exit` to return to the parent shell and clear the environment variables.
+
 ---
 
 ## Testing with Hardhat

config/eth-mainnet/BaseConfig.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0;
 
 contract BaseConfig {

config/eth-mainnet/aave-v2/Config.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.8.0;
 
 import {ILendingPool} from "src/aave-v2/interfaces/aave/ILendingPool.sol";

config/polygon-mumbai/aave-v2/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/aave-v2/libraries/Types.sol";

export_env.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. .env.local
+
+[ -z "${PROTOCOL}" ] && export PROTOCOL="compound"
+[ -z "${NETWORK}" ] && export NETWORK="eth-mainnet"
+
+[ -z "${FOUNDRY_SRC}" ] && export FOUNDRY_SRC="src/${PROTOCOL}/"
+
+[ -z "${FOUNDRY_PROFILE}" ] && export FOUNDRY_PROFILE="${PROTOCOL}"
+[ -z "${FOUNDRY_REMAPPINGS}" ] && export FOUNDRY_REMAPPINGS="@config/=config/${NETWORK}/${PROTOCOL}/"
+[ -z "${FOUNDRY_PRIVATE_KEY}" ] && export FOUNDRY_PRIVATE_KEY="${DEPLOYER_PRIVATE_KEY}"
+[ -z "${FOUNDRY_ETH_RPC_URL}" ] && export FOUNDRY_ETH_RPC_URL="https://${NETWORK}.g.alchemy.com/v2/${ALCHEMY_KEY}"
+
+if [ "${FOUNDRY_PROFILE}" = "production" ]; then
+    export FOUNDRY_TEST="test/prod/${PROTOCOL}/"
+else
+    export FOUNDRY_TEST="test/${PROTOCOL}/"
+fi

foundry.toml

@@ -14,9 +14,6 @@ runs = 1024
 [profile.production.fuzz]
 runs = 256
 
-[profile.common]
-test = "test/common"
-
 [profile.compound]
 fork_block_number = 15_581_371
 

scripts/aave-v2/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/aave-v2/interfaces/IInterestRatesManager.sol";

src/aave-v2/EntryPositionsManager.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./interfaces/IEntryPositionsManager.sol";

src/aave-v2/ExitPositionsManager.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./interfaces/IExitPositionsManager.sol";

src/aave-v2/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/aave/IAToken.sol";

src/aave-v2/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";

src/aave-v2/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";

src/aave-v2/MorphoGovernance.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";

src/aave-v2/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/aave/ILendingPool.sol";

src/aave-v2/MorphoUtils.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import "./interfaces/aave/IPriceOracleGetter.sol";

src/aave-v2/PositionsManagerUtils.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity 0.8.13;
 
 import {IVariableDebtToken} from "./interfaces/aave/IVariableDebtToken.sol";

src/aave-v2/interfaces/IEntryPositionsManager.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IEntryPositionsManager {

src/aave-v2/interfaces/IExitPositionsManager.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IExitPositionsManager {

src/aave-v2/interfaces/IGetterUnderlyingAsset.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IGetterUnderlyingAsset {

src/aave-v2/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 {

src/aave-v2/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 "./aave/ILendingPoolAddressesProvider.sol";

src/aave-v2/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 {

src/aave-v2/interfaces/aave/IAToken.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 import {IERC20} from "./IERC20.sol";

src/aave-v2/interfaces/aave/IERC20.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 /**

src/aave-v2/interfaces/aave/ILendingPool.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 pragma experimental ABIEncoderV2;
 

src/aave-v2/interfaces/aave/ILendingPoolAddressesProvider.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 /**

src/aave-v2/interfaces/aave/IPriceOracleGetter.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 /************

src/aave-v2/interfaces/aave/IScaledBalanceToken.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface IScaledBalanceToken {

src/aave-v2/interfaces/aave/IVariableDebtToken.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 import {IScaledBalanceToken} from "./IScaledBalanceToken.sol";

src/aave-v2/interfaces/lido/ILido.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity >=0.5.0;
 
 interface ILido {

src/aave-v2/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 "../interfaces/IInterestRatesManager.sol";

src/aave-v2/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 "./MarketsLens.sol";

src/aave-v2/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/aave/IPriceOracleGetter.sol";

src/aave-v2/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";

src/aave-v2/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 "../interfaces/aave/IVariableDebtToken.sol";

src/aave-v2/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 {ERC20} from "@rari-capital/solmate/src/utils/SafeTransferLib.sol";

src/aave-v2/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/aave/IPriceOracleGetter.sol";

src/aave-v2/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";

src/aave-v2/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.

src/aave-v2/libraries/aave/DataTypes.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 library DataTypes {

src/aave-v2/libraries/aave/Errors.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 /**

src/aave-v2/libraries/aave/ReserveConfiguration.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import {Errors} from "./Errors.sol";

src/aave-v2/libraries/aave/UserConfiguration.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import {DataTypes} from "./DataTypes.sol";

src/common/rewards-distribution/RewardsDistributor.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "@rari-capital/solmate/src/utils/SafeTransferLib.sol";

src/common/test/FakeToken.sol

@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: GNU AGPLv3
+// SPDX-License-Identifier: AGPL-3.0-only
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

test/aave-v2/TestBitmask.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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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/aave-v2/InterestRatesManager.sol";

test/aave-v2/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 "src/aave-v2/interfaces/lido/ILido.sol";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/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";

test/aave-v2/TestPublicFunctions.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";

test/aave-v2/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";