@diamondslab/diamonds 1.3.0 → 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

@@ -1,7 +1,7 @@
-import "@nomicfoundation/hardhat-ethers";
-import { Diamond } from "../core/Diamond";
-import { FacetCuts } from "../types";
-import { DeploymentStrategy } from "./DeploymentStrategy";
+import '@nomicfoundation/hardhat-ethers';
+import { Diamond } from '../core/Diamond';
+import { FacetCuts } from '../types';
+import { DeploymentStrategy } from './DeploymentStrategy';
 export declare class BaseDeploymentStrategy implements DeploymentStrategy {
     protected verbose: boolean;
     constructor(verbose?: boolean);

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":"AAAA,OAAO,iCAAiC,CAAC;AAIzC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,OAAO,EAGN,SAAS,EAKT,MAAM,UAAU,CAAC;AAQlB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,sBAAuB,YAAW,kBAAkB;IACpD,SAAS,CAAC,OAAO,EAAE,OAAO;gBAAhB,OAAO,GAAE,OAAe;IAExC,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cASvC,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAEhE,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAWpC,kBAAkB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA2E7D,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cASxC,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjE,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAWtC,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/D,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAInC,iBAAiB,CAAC,OAAO,EAAE,OAAO;IAsG5C,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAYvC,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAGhE,iCAAiC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAUxD,sCAAsC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAEjF,8BAA8B,CAAC,OAAO,EAAE,OAAO;cAWrC,mCAAmC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAW9E,kCAAkC,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUnE,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAS3C,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAWpE,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAWxC,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA8FjE,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAS5C,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAErE,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAyC5D,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC;IAmBlD,2BAA2B,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BhE,gCAAgC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA2DjF,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1D,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAI7C,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCtE,0BAA0B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAQjD,+BAA+B,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAOhF"}

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) {
@@ -31,7 +32,7 @@ class BaseDeploymentStrategy {
     async deployDiamondTasks(diamond) {
         console.log(chalk_1.default.blueBright(`🚀 Explicitly deploying DiamondCutFacet and Diamond for ${diamond.diamondName}`));
         // Deploy the DiamondCutFacet - use contract mapping to get correct name
-        const diamondCutContractName = await (0, utils_1.getContractName)("DiamondCutFacet", diamond);
+        const diamondCutContractName = await (0, utils_1.getContractName)('DiamondCutFacet', diamond);
         const diamondCutFactory = await hardhat_1.default.ethers.getContractFactory(diamondCutContractName, diamond.getSigner());
         const diamondCutFacet = await diamondCutFactory.deploy();
         await diamondCutFacet.waitForDeployment();
@@ -51,7 +52,7 @@ class BaseDeploymentStrategy {
         // Register the DiamondCutFacet function selectors
         const diamondCutFacetSelectorsRegistry = diamondCutFacetFunctionSelectors.reduce((acc, selector) => {
             acc[selector] = {
-                facetName: "DiamondCutFacet",
+                facetName: 'DiamondCutFacet',
                 priority: diamond.getFacetsConfig()?.DiamondCutFacet?.priority || 1000, // Default priority if not set
                 address: diamondCutFacetAddress,
                 action: types_1.RegistryFacetCutAction.Deployed,
@@ -64,9 +65,9 @@ class BaseDeploymentStrategy {
         deployedDiamondData.DeployerAddress = await diamond.getSigner().getAddress();
         deployedDiamondData.DiamondAddress = diamondContractAddress;
         deployedDiamondData.DeployedFacets = deployedDiamondData.DeployedFacets || {};
-        deployedDiamondData.DeployedFacets["DiamondCutFacet"] = {
+        deployedDiamondData.DeployedFacets['DiamondCutFacet'] = {
             address: diamondCutFacetAddress,
-            tx_hash: diamondCutFacet.deploymentTransaction()?.hash || "",
+            tx_hash: diamondCutFacet.deploymentTransaction()?.hash || '',
             version: 0,
             funcSelectors: diamondCutFacetFunctionSelectors,
         };
@@ -101,9 +102,9 @@ class BaseDeploymentStrategy {
         const deployedDiamondData = diamond.getDeployedDiamondData();
         const deployedFacets = deployedDiamondData.DeployedFacets || {};
         const facetCuts = [];
-        const sortedFacetNames = Object.keys(deployConfig.facets)
-            .sort((a, b) => {
-            return (deployConfig.facets[a].priority || 1000) - (deployConfig.facets[b].priority || 1000);
+        const sortedFacetNames = Object.keys(deployConfig.facets).sort((a, b) => {
+            return ((deployConfig.facets[a].priority || 1000) -
+                (deployConfig.facets[b].priority || 1000));
         });
         // Save the facet deployment info
         for (const facetName of sortedFacetNames) {
@@ -111,6 +112,8 @@ class BaseDeploymentStrategy {
             const deployedVersion = deployedDiamondData.DeployedFacets?.[facetName]?.version ?? -1;
             const availableVersions = Object.keys(facetConfig.versions || {}).map(Number);
             const upgradeVersion = Math.max(...availableVersions);
+            // Find the original string key that matches the upgrade version number
+            const upgradeVersionKey = Object.keys(facetConfig.versions || {}).find((key) => Number(key) === upgradeVersion) || String(upgradeVersion);
             if (upgradeVersion > deployedVersion || deployedVersion === -1) {
                 if (this.verbose) {
                     console.log(chalk_1.default.blueBright(`🚀 Deploying facet: ${facetName} to version ${upgradeVersion}`));
@@ -118,7 +121,9 @@ class BaseDeploymentStrategy {
                 // Deploy the facet contract - use contract mapping to get correct name
                 const signer = diamond.getSigner();
                 const facetContractName = await (0, utils_1.getContractName)(facetName, diamond);
-                const facetFactory = await hardhat_1.default.ethers.getContractFactory(facetContractName, { signer });
+                const facetFactory = await hardhat_1.default.ethers.getContractFactory(facetContractName, {
+                    signer,
+                });
                 const facetContract = await facetFactory.deploy();
                 await facetContract.waitForDeployment();
                 const deployedFacets = new Map();
@@ -127,9 +132,17 @@ class BaseDeploymentStrategy {
                 facetContract.interface.forEachFunction((func) => {
                     facetSelectors.push(func.selector);
                 });
+                // 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 || [];
+                const includeFuncSelectors = facetConfig.versions?.[upgradeVersionKey]?.deployInclude || [];
+                const resolvedFacetSelectors = (0, resolution_1.computeFacetSelectors)(facetSelectors, includeFuncSelectors, excludeFuncSelectors);
+                facetSelectors.length = 0;
+                facetSelectors.push(...resolvedFacetSelectors);
                 // Initializer function Registry
-                const deployInit = facetConfig.versions?.[upgradeVersion]?.deployInit || "";
-                const upgradeInit = facetConfig.versions?.[upgradeVersion]?.upgradeInit || "";
+                const deployInit = facetConfig.versions?.[upgradeVersionKey]?.deployInit || '';
+                const upgradeInit = facetConfig.versions?.[upgradeVersionKey]?.upgradeInit || '';
                 const initFn = diamond.newDeployment ? deployInit : upgradeInit;
                 if (initFn && facetName !== deployConfig.protocolInitFacet) {
                     diamond.initializerRegistry.set(facetName, initFn);
@@ -137,11 +150,11 @@ class BaseDeploymentStrategy {
                 const newFacetData = {
                     priority: facetConfig.priority || 1000,
                     address: await facetContract.getAddress(),
-                    tx_hash: facetContract.deploymentTransaction()?.hash || "",
+                    tx_hash: facetContract.deploymentTransaction()?.hash || '',
                     version: upgradeVersion,
                     funcSelectors: facetSelectors,
-                    deployInclude: facetConfig.versions?.[upgradeVersion]?.deployInclude || [],
-                    deployExclude: facetConfig.versions?.[upgradeVersion]?.deployExclude || [],
+                    deployInclude: facetConfig.versions?.[upgradeVersionKey]?.deployInclude || [],
+                    deployExclude: facetConfig.versions?.[upgradeVersionKey]?.deployExclude || [],
                     initFunction: initFn,
                     verified: false,
                 };
@@ -176,138 +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 functionSelectors = newFacetData.funcSelectors || [];
-            const includeFuncSelectors = newFacetData.deployInclude || [];
-            const excludeFuncSelectors = newFacetData.deployExclude || [];
-            /* ------------------ Exclusion Filter ------------------ */
-            for (const excludeFuncSelector of excludeFuncSelectors) {
-                // remove from the facets functionSelectors
-                if (excludeFuncSelector in functionSelectors) {
-                    functionSelectors.splice(functionSelectors.indexOf(excludeFuncSelector), 1);
-                }
-                // update action to remove if excluded from registry where a previous deployment associated with facetname
-                if (excludeFuncSelector in registry && registry.get(excludeFuncSelector)?.facetName === newFacetName) {
-                    const existing = registry.get(excludeFuncSelector);
-                    if (existing && 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 includeFuncSelectors) {
-                // Force Replace if already registered by higher priority facet
-                if (includeFuncSelector in registryHigherPrioritySplit) {
-                    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
-                if (includeFuncSelector in newDeployedFacets) {
-                    const existing = newDeployedFacets[newFacetName];
-                    if (existing && existing.funcSelectors) {
-                        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) {
@@ -335,13 +224,13 @@ class BaseDeploymentStrategy {
     async performDiamondCutTasks(diamond) {
         const diamondSignerAddress = await diamond.getSigner()?.getAddress();
         const signer = await hardhat_1.default.ethers.getSigner(diamondSignerAddress);
-        const diamondContract = await hardhat_1.default.ethers.getContractAt("IDiamondCut", diamond.getDeployedDiamondData().DiamondAddress);
+        const diamondContract = await hardhat_1.default.ethers.getContractAt('IDiamondCut', diamond.getDeployedDiamondData().DiamondAddress);
         const signerDiamondContract = diamondContract.connect(signer);
         const deployConfig = diamond.getDeployConfig();
         const deployedDiamondData = diamond.getDeployedDiamondData();
         // Setup initCallData with Atomic Protocol Initializer
         const [initCalldata, initAddress] = await this.getInitCalldata(diamond);
-        // extract facet cuts from the selector registry 
+        // extract facet cuts from the selector registry
         const facetCuts = await this.getFacetCuts(diamond);
         // Validate no orphaned selectors, i.e. 'Add', 'Replace' or 'Deployed' selectors with the same facetNames but different addresses
         await this.validateNoOrphanedSelectors(facetCuts);
@@ -356,7 +245,11 @@ class BaseDeploymentStrategy {
             }
         }
         /* -------------------------- Perform the diamond cut -----------------------*/
-        const facetSelectorCutMap = facetCuts.map(fc => ({ facetAddress: fc.facetAddress, action: fc.action, functionSelectors: fc.functionSelectors }));
+        const facetSelectorCutMap = facetCuts.map((fc) => ({
+            facetAddress: fc.facetAddress,
+            action: fc.action,
+            functionSelectors: fc.functionSelectors,
+        }));
         const tx = await signerDiamondContract.diamondCut(facetSelectorCutMap, initAddress, initCalldata);
         /* --------------------- Update the deployed diamond data ------------------ */
         const txHash = tx.hash;
@@ -364,7 +257,7 @@ class BaseDeploymentStrategy {
         const ifaceList = (0, utils_1.getDeployedFacetInterfaces)(deployedDiamondData);
         // Log the transaction
         if (this.verbose) {
-            await (0, utils_1.logTx)(tx, "DiamondCut", ifaceList);
+            await (0, utils_1.logTx)(tx, 'DiamondCut', ifaceList);
         }
         else {
             console.log(chalk_1.default.blueBright(`🔄 Waiting for DiamondCut transaction to be mined...`));
@@ -400,13 +293,15 @@ class BaseDeploymentStrategy {
         const deployedDiamondData = diamond.getDeployedDiamondData();
         const deployConfig = diamond.getDeployConfig();
         let initAddress = ethers_1.ethers.ZeroAddress;
-        let initCalldata = "0x";
-        const protocolInitFacet = deployConfig.protocolInitFacet || "";
+        let initCalldata = '0x';
+        const protocolInitFacet = deployConfig.protocolInitFacet || '';
         const protocolVersion = deployConfig.protocolVersion;
         const protocolFacetInfo = diamond.getNewDeployedFacets()[protocolInitFacet];
         if (protocolInitFacet && protocolFacetInfo) {
             const versionCfg = deployConfig.facets[protocolInitFacet]?.versions?.[protocolVersion];
-            const initFn = diamond.newDeployment ? versionCfg?.deployInit : versionCfg?.upgradeInit;
+            const initFn = diamond.newDeployment
+                ? versionCfg?.deployInit
+                : versionCfg?.upgradeInit;
             if (initFn) {
                 const iface = new ethers_1.ethers.Interface([`function ${initFn}`]);
                 initAddress = protocolFacetInfo.address;
@@ -426,7 +321,7 @@ class BaseDeploymentStrategy {
         const deployConfig = diamond.getDeployConfig();
         const selectorRegistry = diamond.functionSelectorRegistry;
         /* -------------------------- Prepare the facet cuts -----------------------*/
-        // extract facet cuts from the selector registry 
+        // extract facet cuts from the selector registry
         const facetCuts = Array.from(selectorRegistry.entries())
             .filter(([_, entry]) => entry.action !== types_1.RegistryFacetCutAction.Deployed)
             .map(([selector, entry]) => {
@@ -441,8 +336,8 @@ class BaseDeploymentStrategy {
     }
     async validateNoOrphanedSelectors(facetCuts) {
         // Validate no orphaned selectors, i.e. 'Add', 'Replace' or 'Deployed' selectors with the same facetNames but different addresses
-        const orphanedSelectors = facetCuts.filter(facetCut => {
-            return facetCuts.some(otherFacetCut => {
+        const orphanedSelectors = facetCuts.filter((facetCut) => {
+            return facetCuts.some((otherFacetCut) => {
                 return (otherFacetCut.facetAddress !== facetCut.facetAddress &&
                     otherFacetCut.name === facetCut.name &&
                     (otherFacetCut.action === types_1.RegistryFacetCutAction.Add ||
@@ -469,7 +364,9 @@ class BaseDeploymentStrategy {
             if (!facetSelectorsMap[facetName]) {
                 facetSelectorsMap[facetName] = { address: entry.address, selectors: [] };
             }
-            if (entry.action === types_1.RegistryFacetCutAction.Add || entry.action === types_1.RegistryFacetCutAction.Replace || entry.action === types_1.RegistryFacetCutAction.Deployed) {
+            if (entry.action === types_1.RegistryFacetCutAction.Add ||
+                entry.action === types_1.RegistryFacetCutAction.Replace ||
+                entry.action === types_1.RegistryFacetCutAction.Deployed) {
                 facetSelectorsMap[facetName].selectors.push(selector);
             }
         }
@@ -497,7 +394,7 @@ class BaseDeploymentStrategy {
         }
         // Remove facets with no selectors
         for (const facetName of Object.keys(deployedDiamondData.DeployedFacets)) {
-            if (!facetSelectorsMap[facetName] || facetSelectorsMap[facetName].selectors.length === 0) {
+            if (facetSelectorsMap[facetName]?.selectors.length === 0) {
                 delete deployedDiamondData.DeployedFacets[facetName];
             }
         }