@secondlayer/subgraphs 4.3.4 → 4.4.0

package/dist/src/runtime/reindex.d.ts

@@ -219,6 +219,23 @@ interface ContractDeployFilter {
 	deployer?: string;
 	contractName?: string;
 }
+interface NestedContractCallFilter extends TraitScope, FactoryScope {
+	type: "nested_contract_call";
+	contractId?: string | readonly string[];
+	functionName?: string;
+	caller?: string;
+	sender?: string;
+}
+interface VarSetFilter extends TraitScope, FactoryScope {
+	type: "var_set";
+	contractId?: string | readonly string[];
+	varName?: string;
+}
+interface MapWriteFilter extends TraitScope, FactoryScope {
+	type: "map_set" | "map_insert" | "map_delete";
+	contractId?: string | readonly string[];
+	map?: string;
+}
 /**
 * One declared field of a print payload.
 *
@@ -306,7 +323,7 @@ type UnpinnedPrintEventFilter = PrintEventFields & {
 */
 type PrintEventFilter = PinnedPrintEventFilter | TraitPrintEventFilter | UnpinnedPrintEventFilter;
 /** All subgraph filter types — discriminated on `type` */
-type SubgraphFilter = StxTransferFilter | StxMintFilter | StxBurnFilter | StxLockFilter | FtTransferFilter | FtMintFilter | FtBurnFilter | NftTransferFilter | NftMintFilter | NftBurnFilter | ContractCallFilter | ContractDeployFilter | PrintEventFilter;
+type SubgraphFilter = StxTransferFilter | StxMintFilter | StxBurnFilter | StxLockFilter | FtTransferFilter | FtMintFilter | FtBurnFilter | NftTransferFilter | NftMintFilter | NftBurnFilter | ContractCallFilter | ContractDeployFilter | PrintEventFilter | NestedContractCallFilter | VarSetFilter | MapWriteFilter;
 /** Transaction metadata available in handlers */
 interface TxMeta {
 	txId: string;
@@ -395,10 +412,20 @@ interface SubgraphDefinition {
 	handlers: Record<string, SubgraphHandler>;
 }
 import { Block, Event, Transaction } from "@secondlayer/shared/db";
+/** A runtime event row. `clock: "vm"` marks an opt-in `vm_events` row whose
+*  `event_index` is `ordinal` — a second ordinal that never sorts or
+*  dedupes against classic `events.event_index`. */
+type RuntimeEvent = Event & {
+	clock?: "vm"
+};
 interface BlockData {
 	block: Block;
 	txs: Transaction[];
+	/** Classic `events` rows (Streams 1.0 clock). */
 	events: Event[];
+	/** Opt-in `vm_events` rows on their own clock. Absent/empty on `"*"`
+	*  nodes and on archives collected without `storage`/`contract_calls`. */
+	vmEvents?: RuntimeEvent[];
 }
 /**
 * Where the subgraph runtime reads canonical chain data. Today it taps the

package/dist/src/runtime/reindex.js

@@ -41,6 +41,24 @@ function safeIndexName(name) {
   const hash = createHash("sha256").update(name).digest("hex").slice(0, 8);
   return `${name.slice(0, MAX_IDENT_BYTES - hash.length - 1)}_${hash}`;
 }
+function emitIndexedColumnIndexDDL(schemaName, tableName, colName, opts) {
+  const concurrently = opts?.concurrently ? " CONCURRENTLY" : "";
+  const qualified = `${quotePgIdent(schemaName)}.${quotePgIdent(tableName)}`;
+  const plain = `idx_${schemaName}_${tableName}_${colName}`;
+  const composite = safeIndexName(`idx_${schemaName}_${tableName}_${colName}_id`);
+  const col = quotePgIdent(colName);
+  const id = quotePgIdent("_id");
+  return {
+    create: [
+      `CREATE INDEX${concurrently} IF NOT EXISTS ${quotePgIdent(plain)} ON ${qualified} (${col})`,
+      `CREATE INDEX${concurrently} IF NOT EXISTS ${quotePgIdent(composite)} ON ${qualified} (${col}, ${id})`
+    ],
+    drop: [
+      `DROP INDEX${concurrently} IF EXISTS ${quotePgIdent(schemaName)}.${quotePgIdent(plain)}`,
+      `DROP INDEX${concurrently} IF EXISTS ${quotePgIdent(schemaName)}.${quotePgIdent(composite)}`
+    ]
+  };
+}
 function escapeLiteralDefault(value) {
   if (value === null || value === undefined)
     return "NULL";
@@ -82,8 +100,7 @@ function emitTableDDL(schemaName, tableName, tableDef) {
   statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_tx_id`)} ON ${qualifiedName} (_tx_id)`);
   for (const [colName, col] of Object.entries(tableDef.columns)) {
     if (col.indexed) {
-      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(`idx_${schemaName}_${tableName}_${colName}`)} ON ${qualifiedName} (${quotePgIdent(colName)})`);
-      statements.push(`CREATE INDEX IF NOT EXISTS ${quotePgIdent(safeIndexName(`idx_${schemaName}_${tableName}_${colName}_id`))} ON ${qualifiedName} (${quotePgIdent(colName)}, ${quotePgIdent("_id")})`);
+      statements.push(...emitIndexedColumnIndexDDL(schemaName, tableName, colName).create);
     }
   }
   for (const [colName, col] of Object.entries(tableDef.columns)) {
@@ -992,7 +1009,7 @@ function printContractId(data) {
   const id = (typeof data.contract_identifier === "string" ? data.contract_identifier : undefined) ?? (typeof data.contract_id === "string" ? data.contract_id : undefined);
   return id || undefined;
 }
-function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map) {
+function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map, vmEventsByTx = new Map) {
   const results = [];
   switch (filter.type) {
     case "stx_transfer":
@@ -1157,6 +1174,57 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryCo
       }
       break;
     }
+    case "nested_contract_call":
+    case "var_set":
+    case "map_set":
+    case "map_insert":
+    case "map_delete": {
+      for (const tx of transactions) {
+        const txEvents = vmEventsByTx.get(tx.tx_id) ?? [];
+        const matched = txEvents.filter((e) => {
+          if (e.type !== filter.type)
+            return false;
+          const data = e.data;
+          if (!data)
+            return false;
+          const contractId = printContractId(data);
+          if ("contractId" in filter && filter.contractId) {
+            if (!contractId || !matchAny(contractId, filter.contractId))
+              return false;
+          }
+          if (!traitAllows(filter, contractId, traitContracts))
+            return false;
+          if (!factoryAllows(filter, contractId, factoryContracts))
+            return false;
+          if (filter.type === "nested_contract_call") {
+            if (filter.functionName) {
+              if (typeof data.function_name !== "string" || !matchPattern(data.function_name, filter.functionName))
+                return false;
+            }
+            if (filter.caller) {
+              if (typeof data.caller !== "string" || !matchPattern(data.caller, filter.caller))
+                return false;
+            }
+            if (filter.sender) {
+              if (typeof data.sender !== "string" || !matchPattern(data.sender, filter.sender))
+                return false;
+            }
+          }
+          if (filter.type === "var_set" && filter.varName) {
+            if (typeof data.var_name !== "string" || !matchPattern(data.var_name, filter.varName))
+              return false;
+          }
+          if ((filter.type === "map_set" || filter.type === "map_insert" || filter.type === "map_delete") && filter.map) {
+            if (typeof data.map_name !== "string" || !matchPattern(data.map_name, filter.map))
+              return false;
+          }
+          return true;
+        });
+        if (matched.length > 0)
+          results.push({ tx, events: matched });
+      }
+      break;
+    }
     case "print_event": {
       for (const tx of transactions) {
         const txEvents = eventsByTx.get(tx.tx_id) ?? [];
@@ -1188,17 +1256,23 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryCo
   }
   return results;
 }
-function matchSources(sources, transactions, events, traitContracts = new Map, factoryContracts = new Map) {
+function matchSources(sources, transactions, events, traitContracts = new Map, factoryContracts = new Map, vmEvents = []) {
   const eventsByTx = new Map;
   for (const event of events) {
     const list = eventsByTx.get(event.tx_id) ?? [];
     list.push(event);
     eventsByTx.set(event.tx_id, list);
   }
+  const vmEventsByTx = new Map;
+  for (const event of vmEvents) {
+    const list = vmEventsByTx.get(event.tx_id) ?? [];
+    list.push(event);
+    vmEventsByTx.set(event.tx_id, list);
+  }
   const seen = new Set;
   const results = [];
   for (const [sourceName, filter] of Object.entries(sources)) {
-    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts);
+    const matches = matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts, vmEventsByTx);
     for (const match of matches) {
       const dedupeKey = `${match.tx.tx_id}:${sourceName}`;
       if (!seen.has(dedupeKey)) {
@@ -1773,6 +1847,12 @@ function decodeRawResult(raw) {
   }
   return null;
 }
+function decodeRawHex(hex) {
+  if (hex.startsWith("0x") && hex.length > 2) {
+    return decodeClarityValue(hex);
+  }
+  return hex;
+}
 function safeBigInt(val) {
   if (typeof val === "bigint")
     return val;
@@ -1966,6 +2046,58 @@ function buildEventPayload(filter, tx, event) {
         deployer: tx.sender,
         tx: txMeta
       };
+    case "nested_contract_call": {
+      const data = event.data ?? {};
+      const argsHex = Array.isArray(data.function_args) ? data.function_args.filter((a) => typeof a === "string") : [];
+      return {
+        contractId: printContractId(data) ?? "",
+        sender: typeof data.sender === "string" ? data.sender : null,
+        caller: typeof data.caller === "string" ? data.caller : "",
+        functionName: typeof data.function_name === "string" ? data.function_name : "",
+        args: decodeFunctionArgs2(argsHex),
+        arguments: argsHex,
+        rawResult: typeof data.raw_result === "string" ? data.raw_result : "",
+        result: decodeRawResult(data.raw_result),
+        tx: txMeta
+      };
+    }
+    case "var_set": {
+      const data = event.data ?? {};
+      const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        varName: typeof data.var_name === "string" ? data.var_name : "",
+        rawValue,
+        value: decodeRawHex(rawValue),
+        tx: txMeta
+      };
+    }
+    case "map_set":
+    case "map_insert": {
+      const data = event.data ?? {};
+      const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
+      const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        map: typeof data.map_name === "string" ? data.map_name : "",
+        rawKey,
+        key: decodeRawHex(rawKey),
+        rawValue,
+        value: decodeRawHex(rawValue),
+        tx: txMeta
+      };
+    }
+    case "map_delete": {
+      const data = event.data ?? {};
+      const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
+      return {
+        contractId: printContractId(data) ?? "",
+        map: typeof data.map_name === "string" ? data.map_name : "",
+        rawKey,
+        key: decodeRawHex(rawKey),
+        tx: txMeta
+      };
+    }
     default:
       return {
         ...decoded,
@@ -1994,7 +2126,8 @@ async function runHandlers(subgraph, matched, ctx, opts) {
         units.push({ tx, sourceName, event });
     }
   }
-  units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || (a.event?.event_index ?? -1) - (b.event?.event_index ?? -1));
+  const clockRank = (e) => e?.clock === "vm" ? 1 : 0;
+  units.sort((a, b) => (a.tx.tx_index ?? 0) - (b.tx.tx_index ?? 0) || clockRank(a.event) - clockRank(b.event) || (a.event?.event_index ?? -1) - (b.event?.event_index ?? -1));
   for (const { tx, event, sourceName } of units) {
     if (errors >= threshold) {
       logger4.error("Subgraph error threshold reached, skipping remaining events", {
@@ -2140,11 +2273,15 @@ import {
 import { logger as logger5 } from "@secondlayer/shared/logger";
 
 // src/runtime/batch-loader.ts
+function vmEventId(txId, vmEventIndex) {
+  return `${txId}#vm:${vmEventIndex}`;
+}
 async function loadBlockRange(db, fromHeight, toHeight) {
-  const [blocks, txs, events] = await Promise.all([
+  const [blocks, txs, events, vmRows] = await Promise.all([
     db.selectFrom("blocks").selectAll().where("height", ">=", fromHeight).where("height", "<=", toHeight).where("canonical", "=", true).execute(),
     db.selectFrom("transactions").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute(),
-    db.selectFrom("events").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute()
+    db.selectFrom("events").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).execute(),
+    db.selectFrom("vm_events").selectAll().where("block_height", ">=", fromHeight).where("block_height", "<=", toHeight).orderBy("ordinal", "asc").execute()
   ]);
   const txsByHeight = new Map;
   for (const tx of txs) {
@@ -2160,13 +2297,30 @@ async function loadBlockRange(db, fromHeight, toHeight) {
     list.push(evt);
     eventsByHeight.set(h, list);
   }
+  const vmByHeight = new Map;
+  for (const row of vmRows) {
+    const h = Number(row.block_height);
+    const list = vmByHeight.get(h) ?? [];
+    list.push({
+      id: vmEventId(row.tx_id, Number(row.ordinal)),
+      tx_id: row.tx_id,
+      block_height: h,
+      event_index: Number(row.ordinal),
+      type: row.type,
+      data: row.data,
+      created_at: row.created_at,
+      clock: "vm"
+    });
+    vmByHeight.set(h, list);
+  }
   const result = new Map;
   for (const block of blocks) {
     const h = Number(block.height);
     result.set(h, {
       block,
       txs: txsByHeight.get(h) ?? [],
-      events: eventsByHeight.get(h) ?? []
+      events: eventsByHeight.get(h) ?? [],
+      vmEvents: vmByHeight.get(h) ?? []
     });
   }
   return result;
@@ -2182,6 +2336,9 @@ function avgEventsPerBlock(batch) {
 }
 
 // src/runtime/observer-http-source.ts
+import {
+  VM_NODE_TO_STORED_TYPE
+} from "@secondlayer/shared";
 var OBSERVER_HTTP_EXPORT_PATH = "/internal/observer-events";
 function stripTrailingSlash(url) {
   return url.replace(/\/+$/, "");
@@ -2259,7 +2416,29 @@ function mapNewBlockPayloadToBlockData(payload) {
       created_at: new Date(0)
     };
   });
-  return { block, txs, events };
+  const vmEvents = [];
+  for (const [i, trace] of (p.vm_events ?? []).entries()) {
+    const nodeType = trace.type;
+    if (typeof nodeType !== "string" || !(nodeType in VM_NODE_TO_STORED_TYPE))
+      continue;
+    const stored = VM_NODE_TO_STORED_TYPE[nodeType];
+    const body = trace[nodeType];
+    if (!body || typeof body !== "object")
+      continue;
+    const txId = trace.txid ?? "";
+    const vmIndex = i;
+    vmEvents.push({
+      id: vmEventId(txId, vmIndex),
+      tx_id: txId,
+      block_height: height,
+      event_index: vmIndex,
+      type: stored,
+      data: body,
+      created_at: new Date(0),
+      clock: "vm"
+    });
+  }
+  return { block, txs, events, vmEvents };
 }
 
 class ObserverHttpBlockSource {
@@ -2462,6 +2641,30 @@ function reconstructEvent(e) {
           raw_value: e.payload.raw_value
         }
       };
+    case "nested_contract_call":
+    case "var_set":
+    case "map_set":
+    case "map_insert":
+    case "map_delete":
+      return {
+        ...base,
+        id: vmEventId(e.tx_id, e.event_index),
+        clock: "vm",
+        type: e.event_type,
+        data: {
+          contract_identifier: e.contract_id,
+          ..."payload" in e && e.payload && typeof e.payload === "object" ? e.payload : {},
+          sender: "sender" in e ? e.sender : undefined,
+          caller: "caller" in e ? e.caller : undefined,
+          function_name: "function_name" in e ? e.function_name : undefined,
+          function_args: "function_args" in e ? e.function_args : undefined,
+          raw_result: "raw_result" in e ? e.raw_result : undefined,
+          map_name: "map" in e ? e.map : undefined,
+          var_name: "var_name" in e ? e.var_name : undefined,
+          raw_key: "raw_key" in e ? e.raw_key : undefined,
+          raw_value: "raw_value" in e ? e.raw_value : undefined
+        }
+      };
   }
 }
 
@@ -2508,12 +2711,24 @@ var EVENT_FILTER_TO_INDEX_TYPE = {
   nft_transfer: "nft_transfer",
   nft_mint: "nft_mint",
   nft_burn: "nft_burn",
-  print_event: "print"
+  print_event: "print",
+  nested_contract_call: "nested_contract_call",
+  var_set: "var_set",
+  map_set: "map_set",
+  map_insert: "map_insert",
+  map_delete: "map_delete"
 };
 var TX_SOURCE_TYPES = new Set(["contract_call", "contract_deploy"]);
-var ALL_INDEX_EVENT_TYPES = [
+var VM_INDEX_EVENT_TYPES = new Set([
+  "nested_contract_call",
+  "var_set",
+  "map_set",
+  "map_insert",
+  "map_delete"
+]);
+var CLASSIC_INDEX_EVENT_TYPES = [
   ...new Set(Object.values(EVENT_FILTER_TO_INDEX_TYPE))
-];
+].filter((t) => !VM_INDEX_EVENT_TYPES.has(t));
 function sourceFilters(subgraph) {
   const sources = subgraph.sources;
   return Array.isArray(sources) ? sources : Object.values(sources);
@@ -2530,10 +2745,11 @@ function synthesizeTxsFromEvents(events) {
   return [...byId.values()];
 }
 function indexEventTypesForFilterTypes(filterTypes) {
+  const types = new Set;
   if (filterTypes.some((t) => TX_SOURCE_TYPES.has(t))) {
-    return ALL_INDEX_EVENT_TYPES;
+    for (const t of CLASSIC_INDEX_EVENT_TYPES)
+      types.add(t);
   }
-  const types = new Set;
   for (const t of filterTypes) {
     const indexType = EVENT_FILTER_TO_INDEX_TYPE[t];
     if (indexType)
@@ -2579,6 +2795,9 @@ class PublicApiBlockSource {
     return found.length ? Math.min(...found) : null;
   }
   getTip() {
+    if (this.eventTypes.some((t) => VM_INDEX_EVENT_TYPES.has(t))) {
+      return this.http.getIndexSourceTip();
+    }
     return this.http.getIndexTip();
   }
   async loadBlockRange(fromHeight, toHeight) {
@@ -2602,12 +2821,21 @@ class PublicApiBlockSource {
     }
     for (const list of eventLists) {
       for (const e of list) {
-        map.get(e.block_height)?.events.push(reconstructEvent(e));
+        const bd = map.get(e.block_height);
+        if (!bd)
+          continue;
+        if (VM_INDEX_EVENT_TYPES.has(e.event_type)) {
+          bd.vmEvents ??= [];
+          bd.vmEvents.push(reconstructEvent(e));
+        } else {
+          bd.events.push(reconstructEvent(e));
+        }
       }
     }
     for (const bd of map.values()) {
       bd.txs.sort((a, b) => a.tx_index - b.tx_index);
       bd.events.sort((a, b) => a.event_index - b.event_index);
+      bd.vmEvents?.sort((a, b) => a.event_index - b.event_index);
     }
     return map;
   }
@@ -3245,7 +3473,7 @@ function invalidateSubgraphRoute(subgraphName) {
   routeCache.delete(subgraphName);
   evictSandboxWorker(subgraphName);
 }
-async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, txs, evts) {
+async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, txs, evts, vmEvts = []) {
   const factories = new Map;
   for (const source of Object.values(subgraph.sources)) {
     const factory = source.factory;
@@ -3268,7 +3496,7 @@ async function resolveFactoryContracts(subgraph, blockHeight, schemaName, db, tx
     } catch {}
     const discovering = subgraph.sources[factory.from];
     if (discovering) {
-      const matches = matchSources({ [factory.from]: discovering }, txs, evts, new Map, new Map);
+      const matches = matchSources({ [factory.from]: discovering }, txs, evts, new Map, new Map, vmEvts);
       for (const match of matches) {
         for (const event of match.events ?? []) {
           const payload = buildEventPayload(discovering, match.tx, event);
@@ -3374,10 +3602,12 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
   let block;
   let txs;
   let evts;
+  let vmEvts;
   if (opts?.preloaded) {
     block = opts.preloaded.block;
     txs = opts.preloaded.txs;
     evts = opts.preloaded.events;
+    vmEvts = opts.preloaded.vmEvents ?? [];
   } else {
     const data = (await resolveBlockSource(subgraph).loadBlockRange(blockHeight, blockHeight)).get(blockHeight);
     if (!data) {
@@ -3391,12 +3621,13 @@ async function processBlock(subgraph, subgraphName, blockHeight, opts) {
     block = data.block;
     txs = data.txs;
     evts = data.events;
+    vmEvts = data.vmEvents ?? [];
   }
   const route = await resolveRoute(subgraphName, targetDb);
   const schemaName = route.schemaName;
   const traitContracts = await resolveTraitContracts(subgraph, blockHeight, targetDb);
-  const { resolved: factoryContracts, discovered } = await resolveFactoryContracts(subgraph, blockHeight, schemaName, targetDb, txs, evts);
-  const matched = matchSources(subgraph.sources, txs, evts, traitContracts, factoryContracts);
+  const { resolved: factoryContracts, discovered } = await resolveFactoryContracts(subgraph, blockHeight, schemaName, targetDb, txs, evts, vmEvts);
+  const matched = matchSources(subgraph.sources, txs, evts, traitContracts, factoryContracts, vmEvts);
   result.matched = matched.length;
   if (matched.length === 0) {
     if (!opts?.skipProgressUpdate) {
@@ -3668,7 +3899,7 @@ function decoderNameForEventType(indexEventType) {
   return `decode.${indexEventType}.v1`;
 }
 function decoderNamesForIndexEventTypes(eventTypes) {
-  return eventTypes.map(decoderNameForEventType);
+  return eventTypes.filter((t) => !VM_INDEX_EVENT_TYPES.has(t)).map(decoderNameForEventType);
 }
 function decoderNamesForSubgraph(subgraph) {
   return decoderNamesForIndexEventTypes(referencedIndexEventTypes(subgraph));
@@ -4198,7 +4429,7 @@ async function processBlockRange(def, opts) {
       }
       let result;
       try {
-        const mayWrite = blockData.txs.length > 0 || blockData.events.length > 0;
+        const mayWrite = blockData.txs.length > 0 || blockData.events.length > 0 || (blockData.vmEvents?.length ?? 0) > 0;
         const runBlock = () => processBlockWithRetry(def, subgraphName, height, {
           skipProgressUpdate: true,
           atomicProgress,
@@ -4567,5 +4798,5 @@ export {
   backfillSubgraph
 };
 
-//# debugId=2F4BC80D6FDD19E164756E2164756E21
+//# debugId=8D0663264E89460C64756E2164756E21
 //# sourceMappingURL=reindex.js.map