diamond-detect 0.1.0 → 0.1.1

package/dist/cli.js

@@ -217,6 +217,7 @@ function collectSlotConstants(ctx) {
       if (!isBytes32Constant(node)) return;
       const namespace = extractKeccakStringArg(node.value);
       if (namespace === null) return;
+      const declarationId = typeof node.id === "number" ? node.id : -1;
       const variableName = node.name ?? "<anon>";
       const contract = declaringContract(parents) ?? artifact.contractName;
       const src = node.src;
@@ -224,6 +225,7 @@ function collectSlotConstants(ctx) {
       if (seen.has(dedupeKey)) return;
       seen.add(dedupeKey);
       out.push({
+        declarationId,
         variableName,
         namespace,
         slot: keccak256Hex(namespace),
@@ -235,12 +237,88 @@ function collectSlotConstants(ctx) {
   }
   return out;
 }
+function collectSlotAssignmentValueSrcs(yulNode, srcs) {
+  if (!yulNode || typeof yulNode !== "object") return;
+  const node = yulNode;
+  if (node.nodeType === "YulAssignment") {
+    const targets = node.variableNames;
+    const targetsSlot = Array.isArray(targets) && targets.some((t) => typeof t.name === "string" && t.name.endsWith(".slot"));
+    if (targetsSlot) {
+      const value = node.value;
+      if (value?.nodeType === "YulIdentifier" && typeof value.src === "string") {
+        srcs.add(value.src);
+      }
+    }
+  }
+  for (const key of Object.keys(node)) {
+    const v = node[key];
+    if (Array.isArray(v)) {
+      for (const child of v) collectSlotAssignmentValueSrcs(child, srcs);
+    } else if (v && typeof v === "object") {
+      collectSlotAssignmentValueSrcs(v, srcs);
+    }
+  }
+}
+function collectSlotUsedDeclarationIds(artifacts) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const artifact of artifacts) {
+    if (!artifact.ast) continue;
+    walkAst(artifact.ast, (node) => {
+      if (node.nodeType !== "InlineAssembly") return;
+      const yulAst = node.AST;
+      if (!yulAst) return;
+      const slotValueSrcs = /* @__PURE__ */ new Set();
+      collectSlotAssignmentValueSrcs(yulAst, slotValueSrcs);
+      if (slotValueSrcs.size === 0) return;
+      const refs = node.externalReferences;
+      if (!Array.isArray(refs)) return;
+      for (const ref of refs) {
+        if (typeof ref.src === "string" && slotValueSrcs.has(ref.src) && typeof ref.declaration === "number") {
+          ids.add(ref.declaration);
+        }
+      }
+    });
+  }
+  return ids;
+}
+function collectAliases(artifacts) {
+  const aliases = /* @__PURE__ */ new Map();
+  for (const artifact of artifacts) {
+    if (!artifact.ast) continue;
+    walkAst(artifact.ast, (node) => {
+      if (node.nodeType !== "VariableDeclarationStatement") return;
+      const initialValue = node.initialValue;
+      if (initialValue?.nodeType !== "Identifier") return;
+      const referenced = initialValue.referencedDeclaration;
+      if (typeof referenced !== "number") return;
+      const decls = node.declarations;
+      if (!Array.isArray(decls)) return;
+      for (const d of decls) {
+        if (typeof d?.id === "number") aliases.set(d.id, referenced);
+      }
+    });
+  }
+  return aliases;
+}
+function isUsedAsSlot(constantId, slotUsedIds, aliases) {
+  if (constantId < 0) return false;
+  if (slotUsedIds.has(constantId)) return true;
+  for (const [aliasId, refId] of aliases) {
+    if (refId === constantId && slotUsedIds.has(aliasId)) return true;
+  }
+  return false;
+}
 var diamondStorageAnalyzer = {
   name: "diamond-storage-namespace",
   run(ctx) {
     const constants = collectSlotConstants(ctx);
+    const slotUsedIds = collectSlotUsedDeclarationIds(ctx.artifacts);
+    const aliases = collectAliases(ctx.artifacts);
+    const slotConstants = constants.filter(
+      (c) => isUsedAsSlot(c.declarationId, slotUsedIds, aliases)
+    );
     const bySlot = /* @__PURE__ */ new Map();
-    for (const c of constants) {
+    for (const c of slotConstants) {
       const list = bySlot.get(c.slot) ?? [];
       list.push(c);
       bySlot.set(c.slot, list);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diamond-detect",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Static analyzer for EIP-2535 Diamond storage-slot collisions across facets",
   "homepage": "https://github.com/jayeshy14/Diamond-Storage-Detector#readme",
   "repository": {