morpho-org · MathisGD · Oct 20, 2024 · Oct 9, 2024 · Oct 10, 2024 · Oct 10, 2024
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.5.2
+	branch = 4f57c59f066a03d13de8c65bb34fca8247f5fcb2
 [submodule "lib/solmate"]
 	path = lib/solmate
 	url = https://github.com/Rari-Capital/solmate

diff --git a/config/ConfigLib.sol b/config/ConfigLib.sol
@@ -20,12 +20,13 @@ library ConfigLib {
     string internal constant MORPHO_DAO_PATH = "$.morphoDao";
     string internal constant MORPHO_ETH_PATH = "$.morphoEth";
 
-    function getAddress(Config storage config, string memory key) internal returns (address) {
+    function getAddress(Config storage config, string memory key) internal view returns (address) {
         return config.json.readAddress(string.concat("$.", key));
     }
 
     function getAddressArray(Config storage config, string[] memory keys)
         internal
+        view
         returns (address[] memory addresses)
     {
         addresses = new address[](keys.length);
@@ -35,35 +36,35 @@ library ConfigLib {
         }
     }
 
-    function getChainId(Config storage config) internal returns (uint256) {
+    function getChainId(Config storage config) internal view returns (uint256) {
         return config.json.readUint(CHAIN_ID_PATH);
     }
 
-    function getRpcAlias(Config storage config) internal returns (string memory) {
+    function getRpcAlias(Config storage config) internal view returns (string memory) {
         return config.json.readString(RPC_ALIAS_PATH);
     }
 
-    function getForkBlockNumber(Config storage config) internal returns (uint256) {
+    function getForkBlockNumber(Config storage config) internal view returns (uint256) {
         return config.json.readUint(FORK_BLOCK_NUMBER_PATH);
     }
 
-    function getAddressesProvider(Config storage config) internal returns (address) {
+    function getAddressesProvider(Config storage config) internal view returns (address) {
         return config.json.readAddress(ADDRESSES_PROVIDER_PATH);
     }
 
-    function getMorphoDao(Config storage config) internal returns (address) {
+    function getMorphoDao(Config storage config) internal view returns (address) {
         return config.json.readAddress(MORPHO_DAO_PATH);
     }
 
-    function getMorphoEth(Config storage config) internal returns (address) {
+    function getMorphoEth(Config storage config) internal view returns (address) {
         return config.json.readAddress(MORPHO_ETH_PATH);
     }
 
-    function getWrappedNative(Config storage config) internal returns (address) {
+    function getWrappedNative(Config storage config) internal view returns (address) {
         return getAddress(config, config.json.readString(WRAPPED_NATIVE_PATH));
     }
 
-    function getLsdNatives(Config storage config) internal returns (address[] memory) {
+    function getLsdNatives(Config storage config) internal view returns (address[] memory) {
         return getAddressArray(config, config.json.readStringArray(LSD_NATIVES_PATH));
     }
 }
diff --git a/config/ethereum-mainnet.json b/config/ethereum-mainnet.json
@@ -1,7 +1,7 @@
 {
     "chainId": 1,
     "rpcAlias": "mainnet",
-    "forkBlockNumber": 16841312,
+    "forkBlockNumber": 0,
     "addressesProvider": "0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e",
     "morphoDao": "0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa",
     "morphoEth": "0x33333aea097c193e66081E930c33020272b33333",

diff --git a/foundry.toml b/foundry.toml
@@ -3,9 +3,11 @@ names = true
 sizes = true
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read", path = "./config/"}]
+gas_limit = "18446744073709551615" # 2^64 - 1, to remove the gas limit
+evm_version = "shanghai"
 
 [fuzz]
-runs = 32
+runs = 64
 
 [invariant]
 runs = 4

diff --git a/lib/forge-std b/lib/forge-std
diff --git a/src/PositionsManagerInternal.sol b/src/PositionsManagerInternal.sol
@@ -125,8 +125,7 @@ abstract contract PositionsManagerInternal is MatchingEngine {
 
             uint256 trueP2PBorrow = market.trueP2PBorrow(indexes);
             uint256 borrowCap = config.getBorrowCap() * (10 ** config.getDecimals());
-            uint256 poolDebt =
-                ERC20(market.variableDebtToken).totalSupply() + ERC20(market.stableDebtToken).totalSupply();
+            uint256 poolDebt = ERC20(market.variableDebtToken).totalSupply();
 
             if (amount + trueP2PBorrow + poolDebt > borrowCap) revert Errors.ExceedsBorrowCap();
         }
+1 −0		.gitattributes
+48 −12		.github/workflows/ci.yml
+31 −0		.github/workflows/sync.yml
+0 −3		.gitmodules
+181 −0		CONTRIBUTING.md
+18 −2		README.md
+3 −3		foundry.toml
+0 −1		lib/ds-test
+1 −1		package.json
+646 −0		scripts/vm.py
+5 −3		src/Base.sol
+4 −3		src/Script.sol
+518 −225		src/StdAssertions.sol
+60 −30		src/StdChains.sol
+207 −19		src/StdCheats.sol
+34 −4		src/StdInvariant.sol
+129 −25		src/StdJson.sol
+245 −99		src/StdStorage.sol
+2 −2		src/StdStyle.sol
+283 −0		src/StdToml.sol
+72 −35		src/StdUtils.sol
+7 −6		src/Test.sol
+1,989 −350		src/Vm.sol
+635 −608		src/console.sol
+1 −1,543		src/console2.sol
+2 −2		src/interfaces/IERC4626.sol
+234 −0		src/mocks/MockERC20.sol
+231 −0		src/mocks/MockERC721.sol
+13,937 −0		src/safeconsole.sol
+44 −853		test/StdAssertions.t.sol
+129 −61		test/StdChains.t.sol
+256 −49		test/StdCheats.t.sol
+15 −13		test/StdError.t.sol
+49 −0		test/StdJson.t.sol
+31 −26		test/StdMath.t.sol
+232 −44		test/StdStorage.t.sol
+5 −5		test/StdStyle.t.sol
+49 −0		test/StdToml.t.sol
+81 −36		test/StdUtils.t.sol
+18 −0		test/Vm.t.sol
+8 −0		test/fixtures/test.json
+6 −0		test/fixtures/test.toml
+441 −0		test/mocks/MockERC20.t.sol
+721 −0		test/mocks/MockERC721.t.sol