Merge branch 'master' into 20250530-v3-erc4626-cow-swap-fee-burner

Author: elshan-eth

README.md

@@ -147,6 +147,7 @@ Returns an object with all contracts from a deployment and their addresses.
 | V3 Protocol Fee Helper                                 | [`20250430-v3-protocol-fee-helper`](./v3/tasks/20250430-v3-protocol-fee-helper)                         |
 | V3 Protocol Fee Percentages Provider                   | [`20250502-v3-fee-percentages-provider`](./v3/tasks/20250502-v3-fee-percentages-provider)               |
 | V3 Protocol Fee Sweeper (V2)                           | [`20250503-v3-protocol-fee-sweeper-v2`](./v3/tasks/20250503-v3-protocol-fee-sweeper-v2)                 |
+| V3 Aggregator Batch Router                             | [`20250507-v3-aggregator-batch-router`](./v3/tasks/20250507-v3-aggregator-batch-router)                 |
 | V3 ERC4626 Cow Swap Fee Burner                         | [`20250507-v3-erc4626-cow-swap-fee-burner`](./v3/tasks/20250507-v3-erc4626-cow-swap-fee-burner)         |
 
 ## Scripts

v2/scripts/20230130-ta-transition-migrator/index.ts

@@ -10,17 +10,19 @@ export default async (task: Task, { force, from }: TaskRunOptions = {}): Promise
 
   const inputRoles = [...input.Roles, ...input.DelayedRoles];
 
-  // Filter excluded roles in inputs file from on-chain roles.
-  const onChainRoles = (await getTransitionRoles('mainnet', TRANSITION_START_BLOCK, TRANSITION_END_BLOCK)).filter(
-    (role) => !excludedRoles.find((excludedRole) => isRoleEqual(excludedRole, role))
-  );
+  if (task.mode !== TaskMode.CHECK) {
+    // Filter excluded roles in inputs file from on-chain roles.
+    const onChainRoles = (await getTransitionRoles('mainnet', TRANSITION_START_BLOCK, TRANSITION_END_BLOCK)).filter(
+      (role) => !excludedRoles.find((excludedRole) => isRoleEqual(excludedRole, role))
+    );
 
-  const onchainInputMatch = onChainRoles.every((cRole) => inputRoles.find((iRole) => isRoleEqual(cRole, iRole)));
-  const inputOnchainMatch = inputRoles.every((iRole) => onChainRoles.find((cRole) => isRoleEqual(iRole, cRole)));
-  const rolesMatch = onChainRoles.length === inputRoles.length && onchainInputMatch && inputOnchainMatch;
+    const onchainInputMatch = onChainRoles.every((cRole) => inputRoles.find((iRole) => isRoleEqual(cRole, iRole)));
+    const inputOnchainMatch = inputRoles.every((iRole) => onChainRoles.find((cRole) => isRoleEqual(iRole, cRole)));
+    const rolesMatch = onChainRoles.length === inputRoles.length && onchainInputMatch && inputOnchainMatch;
 
-  if (!rolesMatch) {
-    throw new Error('Input permissions do not match on-chain roles granted to old authorizer');
+    if (!rolesMatch) {
+      throw new Error('Input permissions do not match on-chain roles granted to old authorizer');
+    }
   }
 
   const args = [input.OldAuthorizer, input.NewAuthorizer, inputRoles];