Merge branch 'master' into deployment-preparation/gyro-eclp

README.md

@@ -126,13 +126,13 @@ Returns an object with all contracts from a deployment and their addresses.
 | V3 Stable Pool                                         | [`20241205-v3-stable-pool`](./v3/tasks/20241205-v3-stable-pool)                                         |
 | V3 Router                                              | [`20241205-v3-router`](./v3/tasks/20241205-v3-router)                                                   |
 | V3 Batch Router                                        | [`20241205-v3-batch-router`](./v3/tasks/20241205-v3-batch-router)                                       |
-| V3 Composite Liquidity Router                          | [`20241205-v3-composite-liquidity-router`](./v3/tasks/20241205-v3-composite-liquidity-router)           |
 | V3 Buffer Router                                       | [`20241205-v3-buffer-router`](./v3/tasks/20241205-v3-buffer-router)                                     |
 | V3 Vault Explorer                                      | [`20241205-v3-vault-explorer`](./v3/tasks/20241205-v3-vault-explorer)                                   |
 | V3 Hook Examples                                       | [`20241213-v3-hook-examples`](./v3/tasks/20241213-v3-hook-examples)                                     |
 | V3 Balancer Contract Registry                          | [`20250117-v3-contract-registry`](./v3/tasks/20250117-v3-contract-registry)                             |
 | V3 Gyro 2-CLP                                          | [`20250120-v3-gyro-2clp`](./v3/tasks/20250120-v3-gyro-2clp)                                             |
 | V3 Stable Surge Pool                                   | [`20250121-v3-stable-surge`](./v3/tasks/20250121-v3-stable-surge)                                       |
+| V3 Composite Liquidity Router (2)                      | [`20250123-v3-composite-liquidity-router-v2`](./v3/tasks/20250123-v3-composite-liquidity-router-v2)     |
 | V3 Gyro E-CLP                                          | [`20250124-v3-gyro-eclp`](./v3/tasks/20250124-v3-gyro-eclp)                                             |
 
 ## Scripts
@@ -219,3 +219,4 @@ Go to each deprecated deployment's readme file to learn more about why it is dep
 | Composable Stable Pools V5                          | [`20230711-composable-stable-pool-v5`](./v2/deprecated/20230711-composable-stable-pool-v5)               |
 | Composable Stable Pools V5 (ZKEVM)                  | [`20230711-zkevm-composable-stable-pool-v5`](./v2/deprecated/20230711-zkevm-composable-stable-pool-v5)   |
 | Stakeless Gauge Checkpointer                        | [`20230731-stakeless-gauge-checkpointer`](./v2/deprecated/20230731-stakeless-gauge-checkpointer)         |
+| V3 Composite Liquidity Router                       | [`20241205-v3-composite-liquidity-router`](./v3/deprecated/20241205-v3-composite-liquidity-router)       |

addresses/arbitrum.json

@@ -884,7 +884,7 @@
         "address": "0x1311Fbc9F60359639174c1e7cC2032DbDb5Cc4d1"
       }
     ],
-    "status": "ACTIVE",
+    "status": "DEPRECATED",
     "version": "v3"
   },
   "20241205-v3-router": {

addresses/base.json

@@ -484,7 +484,7 @@
         "address": "0xf23b4DB826DbA14c0e857029dfF076b1c0264843"
       }
     ],
-    "status": "ACTIVE",
+    "status": "DEPRECATED",
     "version": "v3"
   },
   "20241205-v3-router": {

addresses/gnosis.json

@@ -604,7 +604,7 @@
         "address": "0xC1A64500E035D9159C8826E982dFb802003227f0"
       }
     ],
-    "status": "ACTIVE",
+    "status": "DEPRECATED",
     "version": "v3"
   },
   "20241205-v3-router": {

addresses/mainnet.json

@@ -1432,7 +1432,7 @@
         "address": "0x1CD776897ef4f647bf8241Ec69549e4A9cb1D608"
       }
     ],
-    "status": "ACTIVE",
+    "status": "DEPRECATED",
     "version": "v3"
   },
   "20241205-v3-router": {

addresses/sepolia.json

@@ -692,7 +692,7 @@
         "address": "0xc6674C0c7694E9b990eAc939E74F8cc3DD39B4b0"
       }
     ],
-    "status": "ACTIVE",
+    "status": "DEPRECATED",
     "version": "v3"
   },
   "20241205-v3-router": {

package.json

@@ -39,7 +39,7 @@
     "lint:solidity": "solhint 'src/helpers/contracts/**/*.sol'",
     "lint:typescript": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore  --max-warnings 0",
     "prepack": "yarn build",
-    "test": "yarn build && hardhat test v*/tasks/**/test/*.ts",
+    "test": "yarn build && hardhat test v*/**/test/*.ts",
     "ci:prepare-config": "ts-node ci/prepare-config.ts"
   },
   "devDependencies": {

v3/tasks/20241205-v3-composite-liquidity-router/readme.md → v3/deprecated/20241205-v3-composite-liquidity-router/readme.md

@@ -1,5 +1,9 @@
 # 2024-12-05 - V3 Composite Liquidity Router
 
+> ⚠️ **DEPRECATED: do not use** ⚠️
+>
+> This router was superseded by this [updated version](../../tasks/20250123-v3-composite-liquidity-router-v2/).
+
 Composite Liquidity Router deployment for V3.
 Contains `CompositeLiquidityRouter` for complex liquidity operations involving pools with ERC4626 wrappers and nested pools.
 

v3/tasks/20241205-v3-composite-liquidity-router/test/task.fork.ts → v3/deprecated/20241205-v3-composite-liquidity-router/test/task.fork.ts

@@ -5,7 +5,7 @@ import { Contract } from 'ethers';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { fp } from '@helpers/numbers';
 
-describeForkTest('CompositeLiquidityRouter-V3', 'mainnet', 21336200, function () {
+describeForkTest.skip('CompositeLiquidityRouter-V3', 'mainnet', 21336200, function () {
   let task: Task;
   let compositeLiquidityRouter: Contract;
   let wethSigner: SignerWithAddress, alice: SignerWithAddress;