@diamondslab/diamonds 1.3.2 → 1.4.0

package/dist/resolution/selectorResolution.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeFacetSelectors = computeFacetSelectors;
+exports.resolveFunctionSelectorRegistry = resolveFunctionSelectorRegistry;
+const ethers_1 = require("ethers");
+const types_1 = require("../types");
+/**
+ * Compute a facet's candidate selectors: its raw ABI selectors **minus `deployExclude`**.
+ *
+ * `deployInclude` is **additive** (INV-3, M2-E1) — it does NOT reduce the candidate set; a facet keeps
+ * its other selectors. The override (force-ownership over a higher-priority facet) and the additive
+ * priority resolution both happen in `resolveFunctionSelectorRegistry`. Pure.
+ *
+ * @param facetSelectors  the facet's raw ABI function selectors (4-byte, `0x…`)
+ * @param _deployInclude  the facet's `deployInclude` signatures — accepted for API symmetry; additive
+ *                        (not used to filter the candidate set)
+ * @param deployExclude   function signatures to remove
+ * @returns the candidate selector list (a new array; the input is not mutated)
+ */
+function computeFacetSelectors(facetSelectors, _deployInclude, deployExclude) {
+    const result = [...facetSelectors];
+    // Apply deployExclude (removal) only. deployInclude is additive — it does not filter here.
+    for (const excludeSelector of deployExclude) {
+        const selectorToExclude = ethers_1.ethers.id(excludeSelector).slice(0, 10);
+        const index = result.indexOf(selectorToExclude);
+        if (index !== -1) {
+            result.splice(index, 1);
+        }
+    }
+    return result;
+}
+/**
+ * Resolve ownership of every function selector across the newly-deployed facets and write
+ * the result (`Add`/`Replace`/`Remove`/`Deployed` actions) into `registry` **in place**.
+ * Pure — no Hardhat/provider. Extracted verbatim from
+ * `BaseDeploymentStrategy.updateFunctionSelectorRegistryTasks`.
+ */
+function resolveFunctionSelectorRegistry(args) {
+    const { registry, newDeployedFacets, facetNames } = args;
+    const zeroAddress = ethers_1.ethers.ZeroAddress;
+    const newDeployedFacetsByPriority = Object.entries(newDeployedFacets).sort(([, a], [, b]) => (a.priority || 1000) - (b.priority || 1000));
+    for (const [newFacetName, newFacetData] of newDeployedFacetsByPriority) {
+        const currentFacetAddress = newFacetData.address;
+        const priority = newFacetData.priority;
+        const includeFuncSelectors = newFacetData.deployInclude || [];
+        const excludeFuncSelectors = newFacetData.deployExclude || [];
+        // Convert function signatures to selectors
+        const includeFuncSelectorsAsSelectors = includeFuncSelectors.map((sig) => ethers_1.ethers.id(sig).slice(0, 10));
+        const excludeFuncSelectorsAsSelectors = excludeFuncSelectors.map((sig) => ethers_1.ethers.id(sig).slice(0, 10));
+        // Initialize funcSelectors if not present
+        if (!newFacetData.funcSelectors) {
+            newFacetData.funcSelectors = [];
+        }
+        const functionSelectors = newFacetData.funcSelectors;
+        /* ------------------ Exclusion Filter ------------------ */
+        for (const excludeFuncSelector of excludeFuncSelectorsAsSelectors) {
+            // remove from the facets functionSelectors
+            if (functionSelectors.includes(excludeFuncSelector)) {
+                functionSelectors.splice(functionSelectors.indexOf(excludeFuncSelector), 1);
+            }
+            // update action to remove if excluded from registry where a previous deployment associated with facetname
+            if (registry.has(excludeFuncSelector) &&
+                registry.get(excludeFuncSelector)?.facetName === newFacetName) {
+                const existing = registry.get(excludeFuncSelector);
+                if (existing?.facetName === newFacetName) {
+                    registry.set(excludeFuncSelector, {
+                        priority: priority,
+                        // EIP-2535: a Remove cut MUST use address(0) (M3-E2 fix for M3-E1 S-3 —
+                        // was currentFacetAddress, which reverts on-chain on deployExclude-on-upgrade).
+                        address: zeroAddress,
+                        action: types_1.RegistryFacetCutAction.Remove,
+                        facetName: newFacetName,
+                    });
+                }
+            }
+        }
+        /* ------------------ Inclusion Override Filter ------------------ */
+        for (const includeFuncSelector of includeFuncSelectorsAsSelectors) {
+            const existingEntry = registry.get(includeFuncSelector);
+            if (existingEntry?.address &&
+                existingEntry.address !== currentFacetAddress &&
+                existingEntry.action !== types_1.RegistryFacetCutAction.Add) {
+                // Selector already registered/deployed at a different facet address — a selector moved
+                // facets, or a redeployed facet at a new address (the upgrade case; verified M3-E1 S-1).
+                // Reconcile -> Replace, not Add (which would revert "Can't add function that already
+                // exists"). Subsumes the removed dead higherPrioritySplit branch (M3-E3).
+                registry.set(includeFuncSelector, {
+                    priority: priority,
+                    address: currentFacetAddress,
+                    action: types_1.RegistryFacetCutAction.Replace,
+                    facetName: newFacetName,
+                });
+            }
+            else {
+                // Add to the registry
+                registry.set(includeFuncSelector, {
+                    priority: priority,
+                    address: currentFacetAddress,
+                    action: types_1.RegistryFacetCutAction.Add,
+                    facetName: newFacetName,
+                });
+            }
+            // remove from the funcSels so it is not modified in Priority Resolution Pass
+            const existing = newDeployedFacets[newFacetName];
+            if (existing &&
+                existing.funcSelectors &&
+                existing.funcSelectors.includes(includeFuncSelector)) {
+                existing.funcSelectors.splice(existing.funcSelectors.indexOf(includeFuncSelector), 1);
+            }
+        }
+        /* ------------------ Replace Facet and Priority Resolution Pass ------------- */
+        for (const selector of functionSelectors) {
+            const existing = registry.get(selector);
+            if (existing) {
+                const existingPriority = existing.priority;
+                if (existing.facetName === newFacetName) {
+                    // Same facet, update the address
+                    registry.set(selector, {
+                        priority: priority,
+                        address: currentFacetAddress,
+                        action: types_1.RegistryFacetCutAction.Replace,
+                        facetName: newFacetName,
+                    });
+                }
+                else if (priority < existingPriority) {
+                    // Current facet has higher priority, Replace it
+                    registry.set(selector, {
+                        priority: priority,
+                        address: currentFacetAddress,
+                        action: types_1.RegistryFacetCutAction.Replace,
+                        facetName: newFacetName,
+                    });
+                }
+            }
+            else {
+                // New selector, simply add
+                registry.set(selector, {
+                    priority: priority,
+                    address: currentFacetAddress,
+                    action: types_1.RegistryFacetCutAction.Add,
+                    facetName: newFacetName,
+                });
+            }
+        }
+        /* ---------------- Remove Old Function Selectors from facets -------------- */
+        // Set functionselectors with the newFacetName and still different address to Remove
+        for (const [selector, entry] of registry.entries()) {
+            if (entry.facetName === newFacetName && entry.address !== currentFacetAddress) {
+                registry.set(selector, {
+                    priority: entry.priority,
+                    address: zeroAddress,
+                    action: types_1.RegistryFacetCutAction.Remove,
+                    facetName: newFacetName,
+                });
+            }
+        }
+    }
+    // `Remove` function selectors for facets no longer in config (deleted facets)
+    for (const [selector, entry] of registry.entries()) {
+        if (!facetNames.includes(entry.facetName)) {
+            registry.set(selector, {
+                priority: entry.priority,
+                address: zeroAddress,
+                action: types_1.RegistryFacetCutAction.Remove,
+                facetName: entry.facetName,
+            });
+        }
+    }
+}
+//# sourceMappingURL=selectorResolution.js.map

package/dist/resolution/selectorResolution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selectorResolution.js","sourceRoot":"","sources":["../../src/resolution/selectorResolution.ts"],"names":[],"mappings":"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","sourcesContent":["import { ethers } from 'ethers';\nimport {\n\tFunctionSelectorRegistryEntry,\n\tNewDeployedFacets,\n\tRegistryFacetCutAction,\n} from '../types';\n\n/**\n * Pure selector-resolution core for ERC-2535 diamond deployments.\n *\n * Extracted from `BaseDeploymentStrategy` (M1-E1) so the resolution semantics can be\n * unit-tested without a chain and later promoted into the shared core used by both the\n * deployment strategy and the planned pre-launch config validator.\n *\n * Lifted from the strategy in M1-E1 (behavior-preserving). Status of the original quirks:\n *   - the deploy-time `deployInclude` whitelist — **REMOVED in M2-E1**: `deployInclude` is now\n *     **additive** (INV-3); a facet keeps its other selectors (the override is resolved below);\n *   - the inverted/dead `registryHigherPrioritySplit` (`entry.priority > priority`) — **REMOVED in\n *     M3-E3**: it never matched a real conflict; the cases it nominally handled fall through to the\n *     `5b2f7af` Replace branch with the identical result;\n *   - the `5b2f7af` `Replace`-instead-of-`Add` branch — **verified correct (M3-E1 S-1)**; kept as-is.\n *\n * The module takes NO Hardhat/provider dependency (only `ethers` for selector math).\n */\n\n/** Map<functionSelector, registry entry>. Mirrors `Diamond.functionSelectorRegistry`. */\nexport type SelectorRegistry = Map<string, FunctionSelectorRegistryEntry>;\n\n/**\n * Reserved for M3 upgrade/redeploy reconciliation. Today, prior deployed state is carried\n * by the pre-populated `registry` (entries whose action is `Deployed`). Shape aligned to\n * `DeployedDiamondData.DeployedFacets` to minimise adapter code when M3 wires it in.\n */\nexport type PriorDeployedState = Record<\n\tstring,\n\t{ address?: string; funcSelectors?: string[]; version?: number }\n>;\n\n/**\n * Compute a facet's candidate selectors: its raw ABI selectors **minus `deployExclude`**.\n *\n * `deployInclude` is **additive** (INV-3, M2-E1) — it does NOT reduce the candidate set; a facet keeps\n * its other selectors. The override (force-ownership over a higher-priority facet) and the additive\n * priority resolution both happen in `resolveFunctionSelectorRegistry`. Pure.\n *\n * @param facetSelectors  the facet's raw ABI function selectors (4-byte, `0x…`)\n * @param _deployInclude  the facet's `deployInclude` signatures — accepted for API symmetry; additive\n *                        (not used to filter the candidate set)\n * @param deployExclude   function signatures to remove\n * @returns the candidate selector list (a new array; the input is not mutated)\n */\nexport function computeFacetSelectors(\n\tfacetSelectors: string[],\n\t_deployInclude: string[],\n\tdeployExclude: string[],\n): string[] {\n\tconst result = [...facetSelectors];\n\n\t// Apply deployExclude (removal) only. deployInclude is additive — it does not filter here.\n\tfor (const excludeSelector of deployExclude) {\n\t\tconst selectorToExclude = ethers.id(excludeSelector).slice(0, 10);\n\t\tconst index = result.indexOf(selectorToExclude);\n\t\tif (index !== -1) {\n\t\t\tresult.splice(index, 1);\n\t\t}\n\t}\n\n\treturn result;\n}\n\nexport interface ResolveRegistryArgs {\n\t/** The selector registry to resolve into. Mutated IN PLACE (same contract as before). */\n\tregistry: SelectorRegistry;\n\t/** The newly-deployed facets (with addresses, priorities, include/exclude, funcSelectors). */\n\tnewDeployedFacets: NewDeployedFacets;\n\t/** All facet names currently in the deploy config (used to Remove deleted facets). */\n\tfacetNames: string[];\n\t/**\n\t * Reserved for M3 upgrade/redeploy reconciliation. Unused today — prior deployed state\n\t * is carried by the pre-populated `registry` (entries with action `Deployed`).\n\t */\n\tpriorDeployedState?: PriorDeployedState;\n}\n\n/**\n * Resolve ownership of every function selector across the newly-deployed facets and write\n * the result (`Add`/`Replace`/`Remove`/`Deployed` actions) into `registry` **in place**.\n * Pure — no Hardhat/provider. Extracted verbatim from\n * `BaseDeploymentStrategy.updateFunctionSelectorRegistryTasks`.\n */\nexport function resolveFunctionSelectorRegistry(args: ResolveRegistryArgs): void {\n\tconst { registry, newDeployedFacets, facetNames } = args;\n\tconst zeroAddress = ethers.ZeroAddress;\n\n\tconst newDeployedFacetsByPriority = Object.entries(newDeployedFacets).sort(\n\t\t([, a], [, b]) => (a.priority || 1000) - (b.priority || 1000),\n\t);\n\n\tfor (const [newFacetName, newFacetData] of newDeployedFacetsByPriority) {\n\t\tconst currentFacetAddress = newFacetData.address;\n\t\tconst priority: number = newFacetData.priority;\n\t\tconst includeFuncSelectors: string[] = newFacetData.deployInclude || [];\n\t\tconst excludeFuncSelectors: string[] = newFacetData.deployExclude || [];\n\n\t\t// Convert function signatures to selectors\n\t\tconst includeFuncSelectorsAsSelectors = includeFuncSelectors.map((sig) =>\n\t\t\tethers.id(sig).slice(0, 10),\n\t\t);\n\t\tconst excludeFuncSelectorsAsSelectors = excludeFuncSelectors.map((sig) =>\n\t\t\tethers.id(sig).slice(0, 10),\n\t\t);\n\n\t\t// Initialize funcSelectors if not present\n\t\tif (!newFacetData.funcSelectors) {\n\t\t\tnewFacetData.funcSelectors = [];\n\t\t}\n\t\tconst functionSelectors: string[] = newFacetData.funcSelectors;\n\n\t\t/* ------------------ Exclusion Filter ------------------ */\n\t\tfor (const excludeFuncSelector of excludeFuncSelectorsAsSelectors) {\n\t\t\t// remove from the facets functionSelectors\n\t\t\tif (functionSelectors.includes(excludeFuncSelector)) {\n\t\t\t\tfunctionSelectors.splice(functionSelectors.indexOf(excludeFuncSelector), 1);\n\t\t\t}\n\t\t\t// update action to remove if excluded from registry where a previous deployment associated with facetname\n\t\t\tif (\n\t\t\t\tregistry.has(excludeFuncSelector) &&\n\t\t\t\tregistry.get(excludeFuncSelector)?.facetName === newFacetName\n\t\t\t) {\n\t\t\t\tconst existing = registry.get(excludeFuncSelector);\n\t\t\t\tif (existing?.facetName === newFacetName) {\n\t\t\t\t\tregistry.set(excludeFuncSelector, {\n\t\t\t\t\t\tpriority: priority,\n\t\t\t\t\t\t// EIP-2535: a Remove cut MUST use address(0) (M3-E2 fix for M3-E1 S-3 —\n\t\t\t\t\t\t// was currentFacetAddress, which reverts on-chain on deployExclude-on-upgrade).\n\t\t\t\t\t\taddress: zeroAddress,\n\t\t\t\t\t\taction: RegistryFacetCutAction.Remove,\n\t\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\n\t\t/* ------------------ Inclusion Override Filter ------------------ */\n\t\tfor (const includeFuncSelector of includeFuncSelectorsAsSelectors) {\n\t\t\tconst existingEntry = registry.get(includeFuncSelector);\n\t\t\tif (\n\t\t\t\texistingEntry?.address &&\n\t\t\t\texistingEntry.address !== currentFacetAddress &&\n\t\t\t\texistingEntry.action !== RegistryFacetCutAction.Add\n\t\t\t) {\n\t\t\t\t// Selector already registered/deployed at a different facet address — a selector moved\n\t\t\t\t// facets, or a redeployed facet at a new address (the upgrade case; verified M3-E1 S-1).\n\t\t\t\t// Reconcile -> Replace, not Add (which would revert \"Can't add function that already\n\t\t\t\t// exists\"). Subsumes the removed dead higherPrioritySplit branch (M3-E3).\n\t\t\t\tregistry.set(includeFuncSelector, {\n\t\t\t\t\tpriority: priority,\n\t\t\t\t\taddress: currentFacetAddress,\n\t\t\t\t\taction: RegistryFacetCutAction.Replace,\n\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t});\n\t\t\t} else {\n\t\t\t\t// Add to the registry\n\t\t\t\tregistry.set(includeFuncSelector, {\n\t\t\t\t\tpriority: priority,\n\t\t\t\t\taddress: currentFacetAddress,\n\t\t\t\t\taction: RegistryFacetCutAction.Add,\n\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t});\n\t\t\t}\n\n\t\t\t// remove from the funcSels so it is not modified in Priority Resolution Pass\n\t\t\tconst existing = newDeployedFacets[newFacetName];\n\t\t\tif (\n\t\t\t\texisting &&\n\t\t\t\texisting.funcSelectors &&\n\t\t\t\texisting.funcSelectors.includes(includeFuncSelector)\n\t\t\t) {\n\t\t\t\texisting.funcSelectors.splice(\n\t\t\t\t\texisting.funcSelectors.indexOf(includeFuncSelector),\n\t\t\t\t\t1,\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\t/* ------------------ Replace Facet and Priority Resolution Pass ------------- */\n\t\tfor (const selector of functionSelectors) {\n\t\t\tconst existing = registry.get(selector);\n\t\t\tif (existing) {\n\t\t\t\tconst existingPriority = existing.priority;\n\n\t\t\t\tif (existing.facetName === newFacetName) {\n\t\t\t\t\t// Same facet, update the address\n\t\t\t\t\tregistry.set(selector, {\n\t\t\t\t\t\tpriority: priority,\n\t\t\t\t\t\taddress: currentFacetAddress,\n\t\t\t\t\t\taction: RegistryFacetCutAction.Replace,\n\t\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t\t});\n\t\t\t\t} else if (priority < existingPriority) {\n\t\t\t\t\t// Current facet has higher priority, Replace it\n\t\t\t\t\tregistry.set(selector, {\n\t\t\t\t\t\tpriority: priority,\n\t\t\t\t\t\taddress: currentFacetAddress,\n\t\t\t\t\t\taction: RegistryFacetCutAction.Replace,\n\t\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\t// New selector, simply add\n\t\t\t\tregistry.set(selector, {\n\t\t\t\t\tpriority: priority,\n\t\t\t\t\taddress: currentFacetAddress,\n\t\t\t\t\taction: RegistryFacetCutAction.Add,\n\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\n\t\t/* ---------------- Remove Old Function Selectors from facets -------------- */\n\t\t// Set functionselectors with the newFacetName and still different address to Remove\n\t\tfor (const [selector, entry] of registry.entries()) {\n\t\t\tif (entry.facetName === newFacetName && entry.address !== currentFacetAddress) {\n\t\t\t\tregistry.set(selector, {\n\t\t\t\t\tpriority: entry.priority,\n\t\t\t\t\taddress: zeroAddress,\n\t\t\t\t\taction: RegistryFacetCutAction.Remove,\n\t\t\t\t\tfacetName: newFacetName,\n\t\t\t\t});\n\t\t\t}\n\t\t}\n\t}\n\n\t// `Remove` function selectors for facets no longer in config (deleted facets)\n\tfor (const [selector, entry] of registry.entries()) {\n\t\tif (!facetNames.includes(entry.facetName)) {\n\t\t\tregistry.set(selector, {\n\t\t\t\tpriority: entry.priority,\n\t\t\t\taddress: zeroAddress,\n\t\t\t\taction: RegistryFacetCutAction.Remove,\n\t\t\t\tfacetName: entry.facetName,\n\t\t\t});\n\t\t}\n\t}\n}\n"]}

package/dist/strategies/BaseDeploymentStrategy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseDeploymentStrategy.d.ts","sourceRoot":"","sources":["../../src/strategies/BaseDeploymentStrategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BaseDeploymentStrategy.d.ts","sourceRoot":"","sources":["../../src/strategies/BaseDeploymentStrategy.ts"],"names":[],"mappings":"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"}

package/dist/strategies/BaseDeploymentStrategy.js

@@ -10,6 +10,7 @@ const ethers_1 = require("ethers");
 const hardhat_1 = __importDefault(require("hardhat"));
 const types_1 = require("../types");
 const utils_1 = require("../utils");
+const resolution_1 = require("../resolution");
 class BaseDeploymentStrategy {
     verbose;
     constructor(verbose = false) {
@@ -131,26 +132,14 @@ class BaseDeploymentStrategy {
                 facetContract.interface.forEachFunction((func) => {
                     facetSelectors.push(func.selector);
                 });
-                // Apply deployExclude filter to remove selectors before storing
+                // Apply deployExclude (removal) + deployInclude (whitelist) via the pure
+                // resolution core. Behavior-preserving (M1-E1); deployInclude stays a
+                // whitelist here — M2 makes it additive.
                 const excludeFuncSelectors = facetConfig.versions?.[upgradeVersionKey]?.deployExclude || [];
-                for (const excludeSelector of excludeFuncSelectors) {
-                    const selectorToExclude = ethers_1.ethers.id(excludeSelector).slice(0, 10);
-                    const index = facetSelectors.indexOf(selectorToExclude);
-                    if (index !== -1) {
-                        facetSelectors.splice(index, 1);
-                    }
-                }
-                // Apply deployInclude filter to only include specified selectors
                 const includeFuncSelectors = facetConfig.versions?.[upgradeVersionKey]?.deployInclude || [];
-                if (includeFuncSelectors.length > 0) {
-                    // Convert include signatures to selectors
-                    const includeSelectors = includeFuncSelectors.map((sig) => ethers_1.ethers.id(sig).slice(0, 10));
-                    // Filter facetSelectors to only include the specified ones
-                    const filteredSelectors = facetSelectors.filter((selector) => includeSelectors.includes(selector));
-                    // Replace facetSelectors with filtered list
-                    facetSelectors.length = 0;
-                    facetSelectors.push(...filteredSelectors);
-                }
+                const resolvedFacetSelectors = (0, resolution_1.computeFacetSelectors)(facetSelectors, includeFuncSelectors, excludeFuncSelectors);
+                facetSelectors.length = 0;
+                facetSelectors.push(...resolvedFacetSelectors);
                 // Initializer function Registry
                 const deployInit = facetConfig.versions?.[upgradeVersionKey]?.deployInit || '';
                 const upgradeInit = facetConfig.versions?.[upgradeVersionKey]?.upgradeInit || '';
@@ -200,144 +189,14 @@ class BaseDeploymentStrategy {
         this.updateFunctionSelectorRegistryTasks(diamond);
     }
     async updateFunctionSelectorRegistryTasks(diamond) {
-        const registry = diamond.functionSelectorRegistry;
-        const zeroAddress = ethers_1.ethers.ZeroAddress;
-        const newDeployedFacets = diamond.getNewDeployedFacets();
-        const newDeployedFacetsByPriority = Object.entries(newDeployedFacets).sort(([, a], [, b]) => (a.priority || 1000) - (b.priority || 1000));
-        for (const [newFacetName, newFacetData] of newDeployedFacetsByPriority) {
-            const currentFacetAddress = newFacetData.address;
-            const priority = newFacetData.priority;
-            const includeFuncSelectors = newFacetData.deployInclude || [];
-            const excludeFuncSelectors = newFacetData.deployExclude || [];
-            // Convert function signatures to selectors
-            const includeFuncSelectorsAsSelectors = includeFuncSelectors.map((sig) => ethers_1.ethers.id(sig).slice(0, 10));
-            const excludeFuncSelectorsAsSelectors = excludeFuncSelectors.map((sig) => ethers_1.ethers.id(sig).slice(0, 10));
-            // Initialize funcSelectors if not present
-            if (!newFacetData.funcSelectors) {
-                newFacetData.funcSelectors = [];
-            }
-            const functionSelectors = newFacetData.funcSelectors;
-            /* ------------------ Exclusion Filter ------------------ */
-            for (const excludeFuncSelector of excludeFuncSelectorsAsSelectors) {
-                // remove from the facets functionSelectors
-                if (functionSelectors.includes(excludeFuncSelector)) {
-                    functionSelectors.splice(functionSelectors.indexOf(excludeFuncSelector), 1);
-                }
-                // update action to remove if excluded from registry where a previous deployment associated with facetname
-                if (registry.has(excludeFuncSelector) &&
-                    registry.get(excludeFuncSelector)?.facetName === newFacetName) {
-                    const existing = registry.get(excludeFuncSelector);
-                    if (existing?.facetName === newFacetName) {
-                        registry.set(excludeFuncSelector, {
-                            priority: priority,
-                            address: currentFacetAddress,
-                            action: types_1.RegistryFacetCutAction.Remove,
-                            facetName: newFacetName,
-                        });
-                    }
-                }
-            }
-            /* ------------ Higher Priority Split of Registry ------------------ */
-            const registryHigherPrioritySplit = Array.from(registry.entries())
-                .filter(([_, entry]) => entry.priority > priority)
-                .reduce((acc, [selector, entry]) => {
-                if (!acc[entry.facetName]) {
-                    acc[entry.facetName] = [];
-                }
-                acc[entry.facetName].push(selector);
-                return acc;
-            }, {});
-            /* ------------------ Inclusion Override Filter ------------------ */
-            for (const includeFuncSelector of includeFuncSelectorsAsSelectors) {
-                // Force Replace if already registered by higher priority facet
-                const higherPriorityFacet = Object.keys(registryHigherPrioritySplit).find((facetName) => {
-                    return registryHigherPrioritySplit[facetName].includes(includeFuncSelector);
-                });
-                if (higherPriorityFacet) {
-                    registry.set(includeFuncSelector, {
-                        priority: priority,
-                        address: currentFacetAddress,
-                        action: types_1.RegistryFacetCutAction.Replace,
-                        facetName: newFacetName,
-                    });
-                }
-                else {
-                    // Add to the registry
-                    registry.set(includeFuncSelector, {
-                        priority: priority,
-                        address: currentFacetAddress,
-                        action: types_1.RegistryFacetCutAction.Add,
-                        facetName: newFacetName,
-                    });
-                }
-                // remove from the funcSels so it is not modified in Priority Resolution Pass
-                const existing = newDeployedFacets[newFacetName];
-                if (existing &&
-                    existing.funcSelectors &&
-                    existing.funcSelectors.includes(includeFuncSelector)) {
-                    existing.funcSelectors.splice(existing.funcSelectors.indexOf(includeFuncSelector), 1);
-                }
-            }
-            /* ------------------ Replace Facet and Priority Resolution Pass ------------- */
-            for (const selector of functionSelectors) {
-                const existing = registry.get(selector);
-                if (existing) {
-                    const existingPriority = existing.priority;
-                    if (existing.facetName === newFacetName) {
-                        // Same facet, update the address
-                        registry.set(selector, {
-                            priority: priority,
-                            address: currentFacetAddress,
-                            action: types_1.RegistryFacetCutAction.Replace,
-                            facetName: newFacetName,
-                        });
-                    }
-                    else if (priority < existingPriority) {
-                        // Current facet has higher priority, Replace it
-                        registry.set(selector, {
-                            priority: priority,
-                            address: currentFacetAddress,
-                            action: types_1.RegistryFacetCutAction.Replace,
-                            facetName: newFacetName,
-                        });
-                    }
-                }
-                else {
-                    // New selector, simply add
-                    registry.set(selector, {
-                        priority: priority,
-                        address: currentFacetAddress,
-                        action: types_1.RegistryFacetCutAction.Add,
-                        facetName: newFacetName,
-                    });
-                }
-            }
-            /* ---------------- Remove Old Function Selectors from facets -------------- */
-            // Set functionselectors with the newFacetName and still different address to Remove
-            for (const [selector, entry] of registry.entries()) {
-                if (entry.facetName === newFacetName && entry.address !== currentFacetAddress) {
-                    registry.set(selector, {
-                        priority: entry.priority,
-                        address: zeroAddress,
-                        action: types_1.RegistryFacetCutAction.Remove,
-                        facetName: newFacetName,
-                    });
-                }
-            }
-        }
-        // `Remove` function selectors for facets no longer in config (deleted facets)
-        const facetsConfig = diamond.getDeployConfig().facets;
-        const facetNames = Object.keys(facetsConfig);
-        for (const [selector, entry] of registry.entries()) {
-            if (!facetNames.includes(entry.facetName)) {
-                registry.set(selector, {
-                    priority: entry.priority,
-                    address: zeroAddress,
-                    action: types_1.RegistryFacetCutAction.Remove,
-                    facetName: entry.facetName,
-                });
-            }
-        }
+        // Delegates to the pure resolution core (M1-E1). Behavior-preserving: the dead
+        // `higherPrioritySplit` and the `5b2f7af` Replace branch live there verbatim and are
+        // reconciled in M3. The registry Map is mutated in place, exactly as before.
+        (0, resolution_1.resolveFunctionSelectorRegistry)({
+            registry: diamond.functionSelectorRegistry,
+            newDeployedFacets: diamond.getNewDeployedFacets(),
+            facetNames: Object.keys(diamond.getDeployConfig().facets),
+        });
     }
     async postUpdateFunctionSelectorRegistry(diamond) {
         if (this.verbose) {