Merge branch 'refactor/timelocks' into refactor/timelocks-use-vault-mapping

Author: MathisGD

.github/workflows/certora.yml

@@ -17,28 +17,28 @@ jobs:
       matrix:
         conf:
           - AbdicatedFunctions
-          - AllocationMorphoMarketV1Adapter
+          - AllocationMorphoMarketV1AdapterV2
           - AllocationMorphoVaultV1Adapter
           - AllocationVaultV2
-          - ChangesMorphoMarketV1Adapter
+          - ChangesMorphoMarketV1AdapterV2
           - ChangesMorphoVaultV1Adapter
           - ExchangeRate
           - Gates
-          - IdsMorphoMarketV1Adapter
+          - IdsMorphoMarketV1AdapterV2
           - IdsMorphoVaultV1Adapter
           - Immutability
           - Invariants
           - Liveness
           - MarketIds
-          - MorphoMarketV1AdapterFactory
+          - MorphoMarketV1AdapterV2Factory
           - MorphoVaultV1AdapterFactory
           - OwnerSafety
           - PreviewFunctions
           - Reentrancy
           - ReentrancyView
           - RelativeCaps
           - SentinelLiveness
-          - TokensMorphoMarketV1Adapter
+          - TokensMorphoMarketV1AdapterV2
           - TokensMorphoVaultV1Adapter
           - TokensNoAdapter
           - TotalAssetsChange

README.md

@@ -26,7 +26,7 @@ Vaults can set an adapter registry to constrain which adapter they can have and
 
 The following adapters are currently available:
 
-- [Morpho Market V1 Adapter](./src/adapters/MorphoMarketV1Adapter.sol).
+- [Morpho Market V1 Adapter V2](./src/adapters/MorphoMarketV1AdapterV2.sol).
   This adapter allocates to any Morpho Market V1, under the constraints of the [caps](#caps).
 - [Morpho Vault V1 Adapter](./src/adapters/MorphoVaultV1Adapter.sol).
   This adapter allocates to a fixed Morpho Vault V1 (V1.0 and V1.1), under the constraints of the [caps](#caps).

…nfs/AllocationMorphoMarketV1Adapter.conf …s/AllocationMorphoMarketV1AdapterV2.confcertora/confs/AllocationMorphoMarketV1Adapter.conf renamed to certora/confs/AllocationMorphoMarketV1AdapterV2.conf certora/confs/AllocationMorphoMarketV1Adapter.conf renamed to certora/confs/AllocationMorphoMarketV1AdapterV2.conf

@@ -2,18 +2,18 @@
   "files": [
     "certora/helpers/Utils.sol",
     "lib/morpho-blue/certora/helpers/MorphoHarness.sol",
-    "src/adapters/MorphoMarketV1Adapter.sol",
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
     "src/VaultV2.sol",
     "test/mocks/ERC20Mock.sol"
   ],
   "link": [
-    "MorphoMarketV1Adapter:morpho=MorphoHarness",
-    "MorphoMarketV1Adapter:parentVault=VaultV2"
+    "MorphoMarketV1AdapterV2:morpho=MorphoHarness",
+    "MorphoMarketV1AdapterV2:parentVault=VaultV2"
   ],
   "compiler_map": {
     "ERC20Mock": "solc-0.8.28",
     "MorphoHarness": "solc-0.8.19",
-    "MorphoMarketV1Adapter": "solc-0.8.28",
+    "MorphoMarketV1AdapterV2": "solc-0.8.28",
     "Utils": "solc-0.8.28",
     "VaultV2": "solc-0.8.28"
   },
@@ -28,8 +28,8 @@
   "global_timeout": "7200",
   "smt_timeout": "7200",
   "multi_assert_check": true,
-  "verify": "VaultV2:certora/specs/AllocationMorphoMarketV1Adapter.spec",
+  "verify": "VaultV2:certora/specs/AllocationMorphoMarketV1AdapterV2.spec",
   "rule_sanity": "basic",
   "server": "production",
-  "msg": "VaultV2 Allocation Morpho MarketV1 Adapter"
+  "msg": "VaultV2 Allocation Morpho MarketV1 Adapter V2"
 }

…/confs/ChangesMorphoMarketV1Adapter.conf …onfs/ChangesMorphoMarketV1AdapterV2.confcertora/confs/ChangesMorphoMarketV1Adapter.conf renamed to certora/confs/ChangesMorphoMarketV1AdapterV2.conf certora/confs/ChangesMorphoMarketV1Adapter.conf renamed to certora/confs/ChangesMorphoMarketV1AdapterV2.conf

@@ -1,26 +1,26 @@
 {
   "files": [
     "src/VaultV2.sol",
-    "src/adapters/MorphoMarketV1Adapter.sol",
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
     "lib/morpho-blue/src/Morpho.sol",
     "test/mocks/ERC20Mock.sol",
     "certora/helpers/Utils.sol"
   ],
   "link": [
-    "MorphoMarketV1Adapter:parentVault=VaultV2",
-    "MorphoMarketV1Adapter:morpho=Morpho",
-    "MorphoMarketV1Adapter:asset=ERC20Mock"
+    "MorphoMarketV1AdapterV2:parentVault=VaultV2",
+    "MorphoMarketV1AdapterV2:morpho=Morpho",
+    "MorphoMarketV1AdapterV2:asset=ERC20Mock"
   ],
   "compiler_map": {
     "Morpho": "solc-0.8.19",
     "src/**/*.sol": "solc-0.8.28",
     "test/**/*.sol": "solc-0.8.28",
     "certora/**/*.sol": "solc-0.8.28"
   },
-  "verify": "MorphoMarketV1Adapter:certora/specs/ChangesMorphoMarketV1Adapter.spec",
+  "verify": "MorphoMarketV1AdapterV2:certora/specs/ChangesMorphoMarketV1AdapterV2.spec",
   "loop_iter": "5",
   "optimistic_loop": true,
   "optimistic_hashing": true,
   "server": "production",
-  "msg": "VaultV2 MorphoMarketV1Adapter Changes"
+  "msg": "VaultV2 MorphoMarketV1AdapterV2 Changes"
 }

certora/confs/IdsMorphoMarketV1AdapterV2.conf

@@ -0,0 +1,12 @@
+{
+  "files": [
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
+    "certora/helpers/Utils.sol"
+  ],
+  "solc": "solc-0.8.28",
+  "verify": "MorphoMarketV1AdapterV2:certora/specs/IdsMorphoMarketV1AdapterV2.spec",
+  "loop_iter": "5",
+  "optimistic_loop": true,
+  "server": "production",
+  "msg": "VaultV2 MorphoMarketV1AdapterV2 Ids"
+}

certora/confs/MarketIds.conf

@@ -1,15 +1,15 @@
 {
   "files": [
     "certora/helpers/Utils.sol",
-    "src/adapters/MorphoMarketV1Adapter.sol"
+    "src/adapters/MorphoMarketV1AdapterV2.sol"
   ],
   "parametric_contracts": [
-    "MorphoMarketV1Adapter"
+    "MorphoMarketV1AdapterV2"
   ],
   "solc": "solc-0.8.28",
   "optimistic_hashing": true,
   "optimistic_loop": true,
   "loop_iter": "3",
-  "verify": "MorphoMarketV1Adapter:certora/specs/MarketIds.spec",
+  "verify": "MorphoMarketV1AdapterV2:certora/specs/MarketIds.spec",
   "msg": "VaultV2 Market Params List"
 }

certora/confs/MorphoMarketV1AdapterFactory.conf

@@ -0,0 +1,14 @@
+{
+  "files": [
+    "certora/helpers/Utils.sol",
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
+    "src/adapters/MorphoMarketV1AdapterV2Factory.sol"
+  ],
+  "parametric_contracts": [
+    "MorphoMarketV1AdapterV2Factory"
+  ],
+  "solc": "solc-0.8.28",
+  "verify": "MorphoMarketV1AdapterV2Factory:certora/specs/MorphoMarketV1AdapterV2Factory.spec",
+  "server": "production",
+  "msg": "VaultV2 MorphoMarketV1AdapterV2Factory"
+}

certora/confs/MorphoMarketV1AdapterV2Factory.conf

@@ -1,14 +1,14 @@
 {
   "files": [
-    "src/adapters/MorphoMarketV1Adapter.sol",
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
     "src/adapters/MorphoVaultV1Adapter.sol",
     "certora/helpers/VaultV2Harness.sol"
   ],
   "parametric_contracts": [
     "VaultV2Harness"
   ],
   "address": [
-    "MorphoMarketV1Adapter:0x10",
+    "MorphoMarketV1AdapterV2:0x10",
     "MorphoVaultV1Adapter:0x11",
     "VaultV2Harness:0x12"
   ],

certora/confs/Reentrancy.conf

@@ -5,25 +5,25 @@
     "lib/metamorpho/certora/dispatch/ERC20Standard.sol",
     "lib/metamorpho/certora/dispatch/ERC20USDT.sol",
     "certora/helpers/ERC20Helper.sol",
-    "src/adapters/MorphoMarketV1Adapter.sol",
+    "src/adapters/MorphoMarketV1AdapterV2.sol",
     "src/VaultV2.sol"
   ],
   "link": [
-    "VaultV2:liquidityAdapter=MorphoMarketV1Adapter"
+    "VaultV2:liquidityAdapter=MorphoMarketV1AdapterV2"
   ],
   "compiler_map": {
     "MorphoHarness": "solc-0.8.19",
     "ERC20NoRevert": "solc-0.8.28",
     "ERC20Standard": "solc-0.8.28",
     "ERC20USDT": "solc-0.8.28",
     "ERC20Helper": "solc-0.8.28",
-    "MorphoMarketV1Adapter": "solc-0.8.28",
+    "MorphoMarketV1AdapterV2": "solc-0.8.28",
     "VaultV2": "solc-0.8.28"
   },
   "optimistic_hashing": true,
   "optimistic_loop": true,
   "loop_iter": "5",
-  "verify": "VaultV2:certora/specs/TokensMorphoMarketV1Adapter.spec",
+  "verify": "VaultV2:certora/specs/TokensMorphoMarketV1AdapterV2.spec",
   "server": "production",
-  "msg": "VaultV2 Tokens Morpho MarketV1 Adapter"
+  "msg": "VaultV2 Tokens Morpho MarketV1 Adapter V2"
 }